Merged revisions 61724-61824 via svnmerge from
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'
........
diff --git a/Lib/lib2to3/tests/benchmark.py b/Lib/lib2to3/tests/benchmark.py
index 3723f69..e0f3e68 100644
--- a/Lib/lib2to3/tests/benchmark.py
+++ b/Lib/lib2to3/tests/benchmark.py
@@ -13,7 +13,7 @@
from time import time
# Test imports
-from support import adjust_path
+from .support import adjust_path
adjust_path()
# Local imports
diff --git a/Lib/lib2to3/tests/pytree_idempotency.py b/Lib/lib2to3/tests/pytree_idempotency.py
index d83f5cc..eeffe50 100755
--- a/Lib/lib2to3/tests/pytree_idempotency.py
+++ b/Lib/lib2to3/tests/pytree_idempotency.py
@@ -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
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
index 0cd985c..e89ef4d 100755
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
@@ -3036,6 +3036,10 @@
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 @@
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 @@
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)