Merged revisions 65141 via svnmerge from

benjaminp · benjaminp · commit 0f6de936f81e · 2008-07-19T14:19:28.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ................ r65141 | benjamin.peterson | 2008-07-19 09:14:06 -0500 (Sat, 19 Jul 2008) | 9 lines Merged revisions 65137 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r65137 | georg.brandl | 2008-07-19 08:32:57 -0500 (Sat, 19 Jul 2008) | 2 lines #3334: correctly set prefix of imports. ........ ................
diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py
@@ -45,7 +45,7 @@ def transform(self, node, results):
             node.changed()
         else:
             new = FromImport('.', getattr(imp, 'content', None) or [imp])
-            new.prefix = node.get_prefix()
+            new.set_prefix(node.get_prefix())
             node = new
         return node
 
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
@@ -3319,6 +3319,17 @@ def test_dotted_import_as(self):
         a = "from . import foo.bar as bang"
         self.check_both(b, a)
 
+    def test_prefix(self):
+        b = """
+        # prefix
+        import foo.bar
+        """
+        a = """
+        # prefix
+        from . import foo.bar
+        """
+        self.check_both(b, a)
+
 
 if __name__ == "__main__":
     import __main__
