Merge branch 'master' into python-2.4

test/simple_source/def/02_def.py

@@ -13,3 +13,9 @@ def x3(a, b, c=5):
 
 def x4(a, b=5, **c):
     pass
+
+# Had a bug in 2.x where
+# we weren't picking up **kwds when
+# it was the sole parameter
+def funcattrs(**kwds):
+    return

uncompyle6/parsers/parse26.py

@@ -39,7 +39,7 @@ class Python26Parser(Python2Parser):
                             except_handler
 
         tryelsestmt    ::= SETUP_EXCEPT suite_stmts_opt POP_BLOCK
-                           except_handler else_suite COME_FROM
+                           except_handler else_suite come_froms
 
         _ifstmts_jump  ::= c_stmts_opt JUMP_FORWARD COME_FROM POP_TOP
 

uncompyle6/semantics/make_function.py

@@ -390,8 +390,7 @@ def make_function2(self, node, is_lambda, nested=1, codeNode=None):
     if code_has_star_star_arg(code):
         if argc > 0:
             self.write(', ')
-        if argc + kw_pairs > 0:
+        self.write('**%s' % code.co_varnames[argc + kw_pairs])
-            self.write('**%s' % code.co_varnames[argc + kw_pairs])
 
     if is_lambda:
         self.write(": ")