Python 3 fixes for urwid. Closes bpython#243.

Trundle · Trundle · commit 7e51b518de3d · 2014-10-05T16:13:41.000+02:00
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -80,7 +80,9 @@
     'd': 'default',
     }
 
-# Add our keys to the urwid command_map
+
+def getpreferredencoding():
+    return locale.getpreferredencoding() or "ascii"
 
 
 try:
@@ -746,7 +748,8 @@ def _populate_completion(self):
                 func_name, args, is_bound, in_arg = self.argspec
                 args, varargs, varkw, defaults = args[:4]
                 if py3:
-                    kwonly, kwonly_defaults = args[4:]
+                    kwonly = self.argspec[1][4]
+                    kwonly_defaults = self.argspec[1][5] or {}
                 else:
                     kwonly, kwonly_defaults = [], {}
                 markup = [('bold name', func_name),
@@ -972,14 +975,17 @@ def prompt(self, more):
         # We need the caption to use unicode as urwid normalizes later
         # input to be the same type, using ascii as encoding. If the
         # caption is bytes this breaks typing non-ascii into bpython.
-        # Currently this decodes using ascii as I do not know where
-        # ps1 is getting loaded from. If anyone wants to make
-        # non-ascii prompts work feel free to fix this.
         if not more:
-            caption = ('prompt', self.ps1.decode('ascii'))
+            if py3:
+                caption = ('prompt', self.ps1)
+            else:
+                caption = ('prompt', self.ps1.decode(getpreferredencoding()))
             self.stdout_hist += self.ps1
         else:
-            caption = ('prompt_more', self.ps2.decode('ascii'))
+            if py3:
+                caption = ('prompt_more', self.ps2)
+            else:
+                caption = ('prompt_more', self.ps2.decode(getpreferredencoding()))
             self.stdout_hist += self.ps2
         self.edit = BPythonEdit(self.config, caption=caption)
 
@@ -1024,7 +1030,11 @@ def handle_input(self, event):
             self.history.append(inp)
             self.edit.make_readonly()
             # XXX what is this s_hist thing?
-            self.stdout_hist += inp.encode(locale.getpreferredencoding()) + '\n'
+            if py3:
+                self.stdout_hist += inp
+            else:
+                self.stdout_hist += inp.encode(locale.getpreferredencoding())
+            self.stdout_hist += '\n'
             self.edit = None
             # This may take a while, so force a redraw first:
             self.main_loop.draw_screen()
