tip merge

bobf · bobf · commit ed5bc76bc578 · 2009-06-10T11:42:48.000+01:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -498,19 +498,22 @@ def getargspec(func):
 # Same deal with the exceptions :(
                     return None
 
+            is_bound_method = inspect.ismethod(f) and f.im_self is not None
             try:
                 if inspect.isclass(f):
                     argspec = inspect.getargspec(f.__init__)
+                    is_bound_method = True
                 else:
                     argspec = inspect.getargspec(f)
-                self.argspec = [func, argspec]
+                self.argspec = [func, argspec, is_bound_method]
                 return True
 
             except (NameError, TypeError, KeyError):
                 t = getpydocspec(f, func)
                 if t is None:
                     return None
                 self.argspec = t
+                self.argspec.append(is_bound_method)
                 return True
             except AttributeError:
 # This happens if no __init__ is found
@@ -519,24 +522,35 @@ def getargspec(func):
         if not OPTS.arg_spec:
             return False
 
-        stack = ['']
+        stack = [['', 0]]
         try:
             for (token, value) in PythonLexer().get_tokens(self.s):
                 if token is Token.Punctuation:
                     if value == '(':
-                        stack.append('')
+                        stack.append(['', 0])
                     elif value == ')':
                         stack.pop()
+                    elif value == ',':
+                        try:
+                            stack[-1][1] += 1
+                        except TypeError:
+                            stack[-1][1] = ''
                 elif (token is Token.Name or token in Token.Name.subtypes or
-                      token is Token.Operatir and value == '.'):
-                    stack[-1] += value
+                      token is Token.Operator and value == '.'):
+                    stack[-1][0] += value
+                elif token is Token.Operator and value == '=':
+                    stack[-1][1] = stack[-1][0]
                 else:
-                    stack[-1] = ''
-            func = stack.pop() or stack.pop()
+                    stack[-1][0] = ''
+            _, arg_number = stack.pop()
+            func, _ = stack.pop()
         except IndexError:
             return False
 
-        return getargspec(func)
+        if getargspec(func):
+            self.argspec.append(arg_number)
+            return True
+        return False
 
     def check(self):
         """Check if paste mode should still be active and, if not, deactivate
@@ -755,6 +769,8 @@ def mkargspec(self, topline, down):
         kwargs = topline[1][3]
         _args = topline[1][1]
         _kwargs = topline[1][2]
+        is_bound_method = topline[2]
+        in_arg = topline[3]
         max_w = int(self.scr.getmaxyx()[1] * 0.6)
         self.list_win.erase()
         self.list_win.resize(3, max_w)
@@ -766,6 +782,9 @@ def mkargspec(self, topline, down):
         self.list_win.addstr(': (', get_colpair('name'))
         maxh = self.scr.getmaxyx()[0]
 
+        if is_bound_method:
+            in_arg += 1
+
         for k, i in enumerate(args):
             y, x = self.list_win.getyx()
             ln = len(str(i))
@@ -793,7 +812,10 @@ def mkargspec(self, topline, down):
             else:
                 color = get_colpair('token')
 
-            self.list_win.addstr(str(i), color | curses.A_BOLD)
+            if k == in_arg or i == in_arg:
+                color |= curses.A_BOLD
+
+            self.list_win.addstr(str(i), color)
             if kw:
                 self.list_win.addstr('=', get_colpair('punctuation'))
                 self.list_win.addstr(kw, get_colpair('token'))
@@ -1282,6 +1304,9 @@ def p_key(self):
 
         if self.c in (chr(127), 'KEY_BACKSPACE'):
             self.bs()
+            # Redraw (as there might have been highlighted parens)
+            self.print_line('')
+            self.print_line(self.s)
             self.complete()
             return ''
 
@@ -1352,7 +1377,7 @@ def p_key(self):
             self.write2file()
             return ''
 
-        elif self.c == key_dispatch[OPTS.pastebin_key]:
+        elif self.c in key_dispatch[OPTS.pastebin_key]:
             self.pastebin()
             return ''
 
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -40,4 +40,4 @@
 
 # fill dispatch with function keys
 for x in xrange(1,13):
-    key_dispatch['F%s' % str(x)] = 'KEY_F(%s)' % str(x)
+    key_dispatch['F%s' % str(x)] = ('KEY_F(%s)' % str(x),)
