Merge pull request #634 from python-rope/remove-non-recursive-call-fo…

…r-nodes

Remove call_for_nodes(recursive) argument

CHANGELOG.md

@@ -11,6 +11,7 @@
 - #611 Implement JSON DataFile serialization (@lieryan)
 - #630 SQLite models improvements (@lieryan)
 - #631 Implement version hash (@lieryan)
+- #634 Remove call_for_nodes(recursive) argument (@edreamleo)
 
 
 # Release 1.6.0

rope/base/ast.py

@@ -21,12 +21,12 @@ def parse(source, filename="<string>", *args, **kwargs):  # type: ignore
         raise error
 
 
-def call_for_nodes(node, callback, recursive=False):
+def call_for_nodes(node, callback):
     """If callback returns `True` the child nodes are skipped"""
     result = callback(node)
-    if recursive and not result:
+    if not result:
         for child in ast.iter_child_nodes(node):
-            call_for_nodes(child, callback, recursive)
+            call_for_nodes(child, callback)
 
 
 class RopeNodeVisitor(ast.NodeVisitor):

rope/refactor/patchedast.py

@@ -34,7 +34,7 @@ def patch_ast(node, source, sorted_children=False):
     if hasattr(node, "region"):
         return node
     walker = _PatchingASTWalker(source, children=sorted_children)
-    ast.call_for_nodes(node, walker)
+    walker(node)
     return node
 
 
@@ -110,7 +110,7 @@ def _handle(self, node, base_children, eat_parens=False, eat_spaces=False):
                 continue
             offset = self.source.offset
             if isinstance(child, ast.AST):
-                ast.call_for_nodes(child, self)
+                self(child)
                 token_start = child.region[0]
             else:
                 if child is self.String:

rope/refactor/similarfinder.py

@@ -153,7 +153,7 @@ def __init__(self, body, pattern, does_match):
     def find_matches(self):
         if self.matches is None:
             self.matches = []
-            ast.call_for_nodes(self.body, self._check_node, recursive=True)
+            ast.call_for_nodes(self.body, self._check_node)
         return self.matches
 
     def _check_node(self, node):

ropetest/refactor/patchedasttest.py

@@ -1535,7 +1535,7 @@ def __call__(self, node):
                 return self.result is not None
 
         search = Search()
-        ast.call_for_nodes(self.ast, search, recursive=True)
+        ast.call_for_nodes(self.ast, search)
         return search.result
 
     def check_children(self, text, children):