Merge pull request #554 from edreamleo/ekr-getarguments

PR for #553: Fix potential crasher in _getarguments

rope/refactor/extract.py

@@ -949,7 +949,7 @@ def _handle_loop_context(self, node):
 def _get_argnames(arguments):
     result = [node.arg for node in arguments.args if isinstance(node, ast.arg)]
     if arguments.vararg:
-        result.append(vararg.arg)
+        result.append(arguments.vararg.arg)
     if arguments.kwarg:
         result.append(arguments.kwarg.arg)
     return result

ropetest/refactor/extracttest.py

@@ -271,6 +271,22 @@ def new_func(self, a_var):
         """)
         self.assertEqual(expected, refactored)
 
+    def test_extract_method_args_and_kwargs(self):
+        code = dedent("""\
+            def a_func(a, *args, **kwargs):
+                print(a, args, kwargs)
+        """)
+        start, end = self._convert_line_range_to_offset(code, 2, 2)
+        refactored = self.do_extract_method(code, start, end, "new_func")
+        expected = dedent("""\
+            def a_func(a, *args, **kwargs):
+                new_func(a, args, kwargs)
+
+            def new_func(a, args, kwargs):
+                print(a, args, kwargs)
+        """)
+        self.assertEqual(expected, refactored)
+
     def test_extract_method_with_self_as_argument(self):
         code = dedent("""\
             class AClass(object):