superficial unicode output

thomasballinger · thomasballinger · commit ba04eb66ab51 · 2014-11-23T00:02:20.000-05:00
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 import code
 import contextlib
 import errno
@@ -1124,10 +1126,10 @@ def move_screen_up(current_line_start_row):
             info_max_rows = max(visible_space_above, visible_space_below)
             infobox = paint.paint_infobox(info_max_rows,
                                           int(width * self.config.cli_suggestion_width),
-                                          self.matches_iter.matches,
+                                          [s.decode('ascii') for s in self.matches_iter.matches],
                                           self.argspec,
-                                          self.current_match,
-                                          self.docstring,
+                                          None if self.current_match is None else self.current_match.decode('ascii'),
+                                          None if self.docstring is None else self.docstring.decode('utf8'),
                                           self.config,
                                           self.matches_iter.completer.format if self.matches_iter.completer else None)
 
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import logging
 
 from curtsies import fsarray, fmtstr
@@ -83,7 +84,7 @@ def formatted_argspec(argspec, columns, config):
     bolds = {token_color: lambda x: bold(token_color(x)),
             arg_color: lambda x: bold(arg_color(x))}
 
-    s = func_color(func) + arg_color(': (')
+    s = func_color(func.decode('utf8')) + arg_color(': (')
 
     if is_bound_method and isinstance(in_arg, int): #TODO what values could this have?
         in_arg += 1
@@ -97,13 +98,13 @@ def formatted_argspec(argspec, columns, config):
             color = bolds[color]
 
         if not py3:
-            s += color(inspect.strseq(arg, str))
+            s += color(inspect.strseq(arg, str).decode('utf8'))
         else:
             s += color(arg)
 
         if kw is not None:
             s += punctuation_color('=')
-            s += token_color(kw)
+            s += token_color(kw.decode('utf8'))
 
         if i != len(args) - 1:
             s += punctuation_color(', ')
@@ -124,11 +125,11 @@ def formatted_argspec(argspec, columns, config):
             color = token_color
             if in_arg:
                 color = bolds[color]
-            s += color(arg)
+            s += color(arg.decode('utf8'))
             default = kwonly_defaults.get(arg, marker)
             if default is not marker:
                 s += punctuation_color('=')
-                s += token_color(repr(default))
+                s += token_color(repr(default).decode('utf8'))
 
     if _kwargs:
         if args or _args or (py3 and kwonly):
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -22,6 +22,7 @@
 #
 
 from __future__ import with_statement
+from __future__ import unicode_literals
 import code
 import codecs
 import errno
@@ -72,7 +73,7 @@ def __init__(self, locals=None, encoding=None):
         def runsource(self, source, filename='<input>', symbol='single',
                       encode=True):
             if encode:
-                source = '# coding: %s\n%s' % (self.encoding,
+                source = b'# coding: %s\n%s' % (self.encoding,
                                                source.encode(self.encoding))
             return code.InteractiveInterpreter.runsource(self, source,
                                                          filename, symbol)
diff --git a/setup.py b/setup.py
@@ -153,7 +153,7 @@ def initialize_options(self):
 
 if sys.version_info[:2] >= (2, 6):
     # curtsies only supports 2.6 and onwards
-    extras_require['curtsies'] = ['curtsies >=0.1.15, <0.2.0', 'greenlet']
+    extras_require['curtsies'] = ['curtsies >=0.2.0, <0.3.0', 'greenlet']
     extras_require['watch'] = ['watchdog']
     packages.append("bpython.curtsiesfrontend")
     entry_points['console_scripts'].append(
