diff --git a/‎bpython/cli.py‎
Lines changed: 10 additions & 1 deletion b/‎bpython/cli.py‎
Lines changed: 10 additions & 1 deletion
diff --git a/‎bpython/repl.py‎
Lines changed: 1 addition & 1 deletion b/‎bpython/repl.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎bpython/urwid.py‎
Lines changed: 9 additions & 1 deletion b/‎bpython/urwid.py‎
Lines changed: 9 additions & 1 deletion
@@ -69,6 +69,9 @@ def log(x):
     f.write('%s\n' % (x,))
 
 py3 = sys.version_info[0] == 3
+if not py3:
+    import inspect
+
 stdscr = None
 
 def getpreferredencoding():
@@ -676,7 +679,13 @@ def mkargspec(self, topline, down):
             if k == in_arg or i == in_arg:
                 color |= curses.A_BOLD
 
-            self.list_win.addstr(str(i), color)
+            if not py3:
+                # See issue #138: We need to format tuple unpacking correctly
+                # We use the undocumented function inspection.strseq() for
+                # that. Fortunately, that madness is gone in Python 3.
+                self.list_win.addstr(inspect.strseq(i, str), color)
+            else:
+                self.list_win.addstr(str(i), color)
             if kw:
                 self.list_win.addstr('=', punctuation_colpair)
                 self.list_win.addstr(kw, get_colpair(self.config, 'token'))
 
@@ -588,7 +588,7 @@ def complete(self, tab=False):
 
         if not e and self.argspec:
             matches.extend(name + '=' for name in self.argspec[1][0]
-                           if name.startswith(cw))
+                           if isinstance(name, basestring) and name.startswith(cw))
             if py3:
                 matches.extend(name + '=' for name in self.argspec[1][4]
                                if name.startswith(cw))
 
@@ -52,6 +52,8 @@
 import urwid
 
 py3 = sys.version_info[0] == 3
+if not py3:
+    import inspect
 
 Parenthesis = Token.Punctuation.Parenthesis
 
@@ -541,7 +543,13 @@ def _populate_completion(self):
                     if k == in_arg or i == in_arg:
                         color = 'bold ' + color
 
-                    markup.append((color, str(i)))
+                    if not py3:
+                        # See issue #138: We need to format tuple unpacking correctly
+                        # We use the undocumented function inspection.strseq() for
+                        # that. Fortunately, that madness is gone in Python 3.
+                        markup.append((color, inspect.strseq(i, str)))
+                    else:
+                        markup.append((color, str(i)))
                     if kw:
                         markup.extend([('punctuation', '='),
                                        ('token', kw)])