Merge from 1.0

bin/cqlsh

@@ -48,6 +48,7 @@ import time
 import optparse
 import ConfigParser
 import codecs
+import locale
 import re
 import platform
 import warnings
@@ -503,7 +504,7 @@ class Shell(cmd.Cmd):
 
         self.color = color
         if encoding is None:
-            encoding = sys.stdout.encoding or 'ascii'
+            encoding = locale.getpreferredencoding()
         self.encoding = encoding
         self.output_codec = codecs.lookup(encoding)