aboutsummaryrefslogtreecommitdiffstatshomepage
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:20:16 +0000
committerMartin v. Löwis <martin@v.loewis.de>2010-02-01 01:20:16 +0000
commit9f92a2b5a1dc2ec237ca1a744e3774635192cb33 (patch)
treeb5ba691adcc14ff9341b352237b77032580b0762 /Lib/lib2to3/fixes/fix_import.py
parent66f9fea782d330b28fe142ac4e58faff8a6f42d1 (diff)
downloadcpython-9f92a2b5a1dc2ec237ca1a744e3774635192cb33.tar.gz
cpython-9f92a2b5a1dc2ec237ca1a744e3774635192cb33.zip
Merged revisions 77900 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77900 | martin.v.loewis | 2010-02-01 02:18:51 +0100 (Mo, 01 Feb 2010) | 24 lines 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 998fe613956..625611d842b 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