Always use repr() for displaying argument default values.

Trundle · Trundle · commit c4f93febf1bd · 2011-03-18T21:05:42.000+01:00
Closes issue bpython#153.
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -653,7 +653,7 @@ def mkargspec(self, topline, down):
             ln = len(str(i))
             kw = None
             if kwargs and k + 1 > len(args) - len(kwargs):
-                kw = str(kwargs[k - (len(args) - len(kwargs))])
+                kw = repr(kwargs[k - (len(args) - len(kwargs))])
                 ln += len(kw) + 1
 
             if ln + x >= w:
@@ -685,7 +685,7 @@ def mkargspec(self, topline, down):
                 self.list_win.addstr(inspect.strseq(i, str), color)
             else:
                 self.list_win.addstr(str(i), color)
-            if kw:
+            if kw is not None:
                 self.list_win.addstr('=', punctuation_colpair)
                 self.list_win.addstr(kw, get_colpair(self.config, 'token'))
             if k != len(args) -1:
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -83,7 +83,7 @@ def formatarg(self, name):
         return string
 
     def formatvalue(self, value):
-        return '=%s' % (value, )
+        return '=%r' % (value, )
 
 
 class ExceptionDialog(gtk.MessageDialog):
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -100,6 +100,18 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             setattr(type_, '__getattr__', __getattr__)
         # /Dark magic
 
+class _Repr(object):
+    """
+    Helper for `fixlongargs()`: Returns the given value in `__repr__()`.
+    """
+
+    def __init__(self, value):
+        self.value = value
+
+    def __repr__(self):
+        return self.value
+
+    __str__ = __repr__
 
 def parsekeywordpairs(signature):
     tokens = PythonLexer().get_tokens(signature)
@@ -164,8 +176,8 @@ def fixlongargs(f, argspec):
     kwparsed = parsekeywordpairs(signature)
 
     for i, (key, value) in enumerate(zip(keys, values)):
-        if len(str(value)) != len(kwparsed[key]):
-            values[i] = kwparsed[key]
+        if len(repr(value)) != len(kwparsed[key]):
+            values[i] = _Repr(kwparsed[key])
 
     argspec[3] = values
 
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -557,7 +557,7 @@ def _populate_completion(self):
                 # does clever wrapping. I do not (yet).
                 for k, i in enumerate(args):
                     if defaults and k + 1 > len(args) - len(defaults):
-                        kw = str(defaults[k - (len(args) - len(defaults))])
+                        kw = repr(defaults[k - (len(args) - len(defaults))])
                     else:
                         kw = None
 
@@ -576,7 +576,7 @@ def _populate_completion(self):
                         markup.append((color, inspect.strseq(i, str)))
                     else:
                         markup.append((color, str(i)))
-                    if kw:
+                    if kw is not None:
                         markup.extend([('punctuation', '='),
                                        ('token', kw)])
                     if k != len(args) - 1:
