Merge pull request #538 from edreamleo/ekr-walk-special-case

PR: move special case from walk to _ScopeVisitor._ImportFrom

rope/base/ast.py

@@ -22,17 +22,12 @@ def parse(source, filename="<string>"):
         raise error
 
 
-def walk(node, walker) -> None:
+def walk(node, walker):
     """Walk the syntax tree"""
     method_name = "_" + node.__class__.__name__
     method = getattr(walker, method_name, None)
     if method is not None:
-        if isinstance(node, ast.ImportFrom) and node.module is None:
-            # In python < 2.7 ``node.module == ''`` for relative imports
-            # but for python 2.7 it is None. Generalizing it to ''.
-            node.module = ""
-        method(node)
-        return
+        return method(node)
     for child in get_child_nodes(node):
         walk(child, walker)
 

rope/base/pynames.py

@@ -114,7 +114,8 @@ def _get_pymodule(self):
             pycore = self.importing_module.pycore
             if self.resource is not None:
                 self.pymodule.set(pycore.project.get_pymodule(self.resource))
-            elif self.module_name is not None:
+            else:
+                assert isinstance(self.module_name, str)
                 try:
                     if self.level == 0:
                         pymodule = pycore.project.get_module(

rope/base/pyobjectsdef.py

@@ -531,7 +531,11 @@ def _ImportFrom(self, node):
         level = 0
         if node.level:
             level = node.level
-        imported_module = pynames.ImportedModule(self.get_module(), node.module, level)
+        imported_module = pynames.ImportedModule(
+            self.get_module(),
+            node.module or "",
+            level,
+        )
         if self._is_ignored_import(imported_module):
             return
         if len(node.names) == 1 and node.names[0].name == "*":

rope/refactor/patchedast.py

@@ -522,7 +522,6 @@ def _ImportFrom(self, node):
         children = ["from"]
         if node.level:
             children.append("." * node.level)
-        # see comment at rope.base.ast.walk
         children.extend([node.module or "", "import"])
         children.extend(self._child_nodes(node.names, ","))
         self._handle(node, children)