Fix for issue bpython#109 (bpython.inspection.parsekeywordpairs).

Trundle · Trundle · commit ad6ceff37160 · 2012-09-30T00:23:03.000+02:00
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -27,9 +27,7 @@
 import keyword
 import pydoc
 import re
-import sys
 import types
-from itertools import dropwhile
 
 from pygments.token import Token
 
@@ -115,36 +113,31 @@ def __repr__(self):
 
 def parsekeywordpairs(signature):
     tokens = PythonLexer().get_tokens(signature)
+    preamble = True
     stack = []
     substack = []
     parendepth = 0
-    begin = False
     for token, value in tokens:
-        if not begin:
-            if token is Token.Punctuation and value == u'(':
-                begin = True
+        if preamble:
+            if token is Token.Punctuation and value == u"(":
+                preamble = False
             continue
 
         if token is Token.Punctuation:
-            if value == u'(':
+            if value in [u'(', u'{', u'[']:
                 parendepth += 1
-            elif value == u')':
+            elif value in [u')', u'}', u']']:
                 parendepth -= 1
             elif value == ':' and parendepth == -1:
                 # End of signature reached
                 break
+            if ((value == ',' and parendepth == 0) or
+                  (value == ')' and parendepth == -1)):
+                stack.append(substack)
+                substack = []
+                continue
 
-        if parendepth > 0:
-            substack.append(value)
-            continue
-
-        if (token is Token.Punctuation and
-            (value == ',' or (value == ')' and parendepth == -1))):
-            stack.append(substack[:])
-            del substack[:]
-            continue
-
-        if value and value.strip():
+        if value and (parendepth > 0 or value.strip()):
             substack.append(value)
 
     d = {}
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -31,6 +31,7 @@ def spam():
         self.assertFalse(inspection.is_callable(None))
 
     def test_parsekeywordpairs(self):
+        # See issue #109
         def fails(spam=['-a', '-b']):
             pass
 
