summaryrefslogtreecommitdiffstats
path: root/Lib/lib2to3/fixes/fix_import.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-02-01 01:17:43 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-02-01 01:17:43 (GMT)
commitc0098595db55731f3c3ff8a17b5199e5e6b0e14d (patch)
tree2f2153b54f3de038c1afc4caa29fc4388122374c /Lib/lib2to3/fixes/fix_import.py
parentd85f1c01afebd1db5d9400ba83b6d90e0819ce79 (diff)
downloadcpython-c0098595db55731f3c3ff8a17b5199e5e6b0e14d.zip
cpython-c0098595db55731f3c3ff8a17b5199e5e6b0e14d.tar.gz
cpython-c0098595db55731f3c3ff8a17b5199e5e6b0e14d.tar.bz2
Merged revisions 77898 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ................ r77898 | martin.v.loewis | 2010-02-01 02:15:39 +0100 (Mo, 01 Feb 2010) | 17 lines Merged revisions 77855-77856,77870 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r77855 | benjamin.peterson | 2010-01-30 17:32:05 +0100 (Sa, 30 Jan 2010) | 1 line don't return node if it is not changed ........ r77856 | benjamin.peterson | 2010-01-30 17:35:29 +0100 (Sa, 30 Jan 2010) | 1 line return None to indicate no change ........ r77870 | benjamin.peterson | 2010-01-31 02:21:26 +0100 (So, 31 Jan 2010) | 1 line never return the original node given to transform() ........ ................
Diffstat (limited to 'Lib/lib2to3/fixes/fix_import.py')
-rw-r--r--Lib/lib2to3/fixes/fix_import.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py
index 4c75133..935f316 100644
--- a/Lib/lib2to3/fixes/fix_import.py
+++ b/Lib/lib2to3/fixes/fix_import.py
@@ -56,7 +56,6 @@ class FixImport(fixer_base.BaseFix):
if self.probably_a_local_import(imp.value):
imp.value = "." + imp.value
imp.changed()
- return node
else:
have_local = False
have_absolute = False