Merge branch 'master' into issue_293

python-rope · Oct 9, 2021 · 030d474 · 030d474
2 parents 38ec9bd + 214cb56
commit 030d474
Show file tree

Hide file tree

Showing 15 changed files with 2,986 additions and 1,315 deletions.
diff --git a/rope/refactor/patchedast.py b/rope/refactor/patchedast.py
@@ -97,6 +97,15 @@ def __call__(self, node):
             node.sorted_children = ast.get_children(node)
 
     def _handle(self, node, base_children, eat_parens=False, eat_spaces=False):
+        if hasattr(node, "region"):
+            # ???: The same node was seen twice; what should we do?
+            warnings.warn(
+                "Node <%s> has been already patched; please report!"
+                % node.__class__.__name__,
+                RuntimeWarning,
+            )
+            return
+
         base_children = collections.deque(base_children)
         self.children_stack.append(base_children)
         children = collections.deque()

diff --git a/rope/refactor/usefunction.py b/rope/refactor/usefunction.py
@@ -27,16 +27,16 @@ def _check_returns(self):
         node = self.pyfunction.get_ast()
         if _yield_count(node):
             raise exceptions.RefactoringError(
-                "Use function should not " "be used on generators."
+                "Use function should not be used on generatorS."
             )
         returns = _return_count(node)
         if returns > 1:
             raise exceptions.RefactoringError(
-                "usefunction: Function has more " "than one return statement."
+                "usefunction: Function has more than one return statement."
             )
         if returns == 1 and not _returns_last(node):
             raise exceptions.RefactoringError(
-                "usefunction: return should " "be the last statement."
+                "usefunction: return should be the last statement."
             )
 
     def get_changes(self, resources=None, task_handle=taskhandle.NullTaskHandle()):