mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 61724-61824 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r61730 | martin.v.loewis | 2008-03-22 02:20:58 +0100 (Sa, 22 Mär 2008) | 2 lines

  More explicit relative imports.
........
  r61755 | david.wolever | 2008-03-22 21:33:52 +0100 (Sa, 22 Mär 2008) | 1 line

  Fixing #2446 -- 2to3 now translates 'import foo' to 'from . import foo'
........
  r61824 | david.wolever | 2008-03-24 01:30:24 +0100 (Mo, 24 Mär 2008) | 3 lines

  Fixed a bug where 'from itertools import izip' would return 'from itertools import'
........
This commit is contained in:
Martin v. Löwis 2008-03-24 00:46:53 +00:00
parent 440ca772f3
commit 966d0e0930
6 changed files with 62 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/lib2to3/tests/benchmark.py
View file

@ -13,7 +13,7 @@ import sys
from time import time
# Test imports
from support import adjust_path
from .support import adjust_path
adjust_path()
# Local imports

2
Lib/lib2to3/tests/pytree_idempotency.py
View file

@ -7,7 +7,7 @@
__author__ = "Guido van Rossum <guido@python.org>"
# Support imports (need to be imported first)
import support
from . import support
# Python imports
import os

18
Lib/lib2to3/tests/test_fixers.py
View file

@ -3036,6 +3036,10 @@ class Test_itertools_imports(FixerTestCase):
a = ""
self.check(b, a)
b = "from itertools import izip"
a = ""
self.check(b, a)
def test_import_as(self):
b = "from itertools import izip, bar as bang, imap"
a = "from itertools import bar as bang"
@ -3105,6 +3109,10 @@ class Test_import(FixerTestCase):
self.failUnlessEqual(set(self.files_checked), expected_checks)
def test_from(self):
b = "from foo import bar, baz"
a = "from .foo import bar, baz"
self.check_both(b, a)
b = "from foo import bar"
a = "from .foo import bar"
self.check_both(b, a)
@ -3121,17 +3129,21 @@ class Test_import(FixerTestCase):
def test_import(self):
b = "import foo"
a = "import .foo"
a = "from . import foo"
self.check_both(b, a)
b = "import foo, bar"
a = "from . import foo, bar"
self.check_both(b, a)
def test_dotted_import(self):
b = "import foo.bar"
a = "import .foo.bar"
a = "from . import foo.bar"
self.check_both(b, a)
def test_dotted_import_as(self):
b = "import foo.bar as bang"
a = "import .foo.bar as bang"
a = "from . import foo.bar as bang"
self.check_both(b, a)