[Python-checkins] r65141 - in python/trunk/Lib/lib2to3: fixes/fix_import.py tests/test_fixers.py

Sat Jul 19 16:14:06 CEST 2008

Author: benjamin.peterson
Date: Sat Jul 19 16:14:06 2008
New Revision: 65141
Log:
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 (2008年7月19日) | 2 lines
 
 #3334: correctly set prefix of imports.
........
Modified:
 python/trunk/Lib/lib2to3/ (props changed)
 python/trunk/Lib/lib2to3/fixes/fix_import.py
 python/trunk/Lib/lib2to3/tests/test_fixers.py
Modified: python/trunk/Lib/lib2to3/fixes/fix_import.py
==============================================================================

--- python/trunk/Lib/lib2to3/fixes/fix_import.py	(original)
+++ python/trunk/Lib/lib2to3/fixes/fix_import.py	Sat Jul 19 16:14:06 2008
@@ -45,7 +45,7 @@
 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
 
Modified: python/trunk/Lib/lib2to3/tests/test_fixers.py
==============================================================================
--- python/trunk/Lib/lib2to3/tests/test_fixers.py	(original)
+++ python/trunk/Lib/lib2to3/tests/test_fixers.py	Sat Jul 19 16:14:06 2008
@@ -3319,6 +3319,17 @@
 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__
