Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 65141 via svnmerge from 

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.
  ........
................
This commit is contained in:
Benjamin Peterson 2008-07-19 14:19:28 +00:00
parent 7d4f39a2ba
commit 0f6de936f8
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/lib2to3/fixes/fix_import.py
View File

@ -45,7 +45,7 @@ class FixImport(fixer_base.BaseFix):
node.changed() node.changed()
else: else:
new = FromImport('.', getattr(imp, 'content', None) or [imp]) new = FromImport('.', getattr(imp, 'content', None) or [imp])
new.prefix = node.get_prefix() new.set_prefix(node.get_prefix())
node = new node = new
return node return node

11
Lib/lib2to3/tests/test_fixers.py
View File

@ -3319,6 +3319,17 @@ class Test_import(FixerTestCase):
a = "from . import foo.bar as bang" a = "from . import foo.bar as bang"
self.check_both(b, a) 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__": if __name__ == "__main__":
import __main__ import __main__