From 7bd1793f1fc6bbad17ed2a774819a102d400a8b1 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 4 Oct 2008 20:55:50 +0000
Subject: Merged revisions 66707,66775,66782 via svnmerge from
 svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

........
  r66707 | benjamin.peterson | 2008-09-30 18:27:10 -0500 (Tue, 30 Sep 2008) | 1 line

  fix #4001: fix_imports didn't check for __init__.py before converting to relative imports
........
  r66775 | collin.winter | 2008-10-03 12:08:26 -0500 (Fri, 03 Oct 2008) | 4 lines

  Add an alternative iterative pattern matching system that, while slower, correctly parses files that cause the faster recursive pattern matcher to fail with a recursion error. lib2to3 falls back to the iterative matcher if the recursive one fails.

  Fixes http://bugs.python.org/issue2532. Thanks to Nick Edds.
........
  r66782 | benjamin.peterson | 2008-10-03 17:51:36 -0500 (Fri, 03 Oct 2008) | 1 line

  add Victor Stinner's fixer for os.getcwdu -> os.getcwd #4023
........
---
 Lib/lib2to3/fixes/fix_getcwdu.py | 18 ++++++++++++++++++
 Lib/lib2to3/fixes/fix_import.py  |  4 ++++
 2 files changed, 22 insertions(+)
 create mode 100644 Lib/lib2to3/fixes/fix_getcwdu.py

(limited to 'Lib/lib2to3/fixes')

diff --git a/Lib/lib2to3/fixes/fix_getcwdu.py b/Lib/lib2to3/fixes/fix_getcwdu.py
new file mode 100644
index 0000000000..1175e5684c
--- /dev/null
+++ b/Lib/lib2to3/fixes/fix_getcwdu.py
@@ -0,0 +1,18 @@
+"""
+Fixer that changes os.getcwdu() to os.getcwd().
+"""
+# Author: Victor Stinner
+
+# Local imports
+from .. import fixer_base
+from ..fixer_util import Name
+
+class FixGetcwdu(fixer_base.BaseFix):
+
+    PATTERN = """
+              power< 'os' trailer< dot='.' name='getcwdu' > any* >
+              """
+
+    def transform(self, node, results):
+        name = results["name"]
+        name.replace(Name("getcwd", prefix=name.get_prefix()))
diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py
index 1fa465c1a2..29b00318fe 100644
--- a/Lib/lib2to3/fixes/fix_import.py
+++ b/Lib/lib2to3/fixes/fix_import.py
@@ -54,6 +54,10 @@ def probably_a_local_import(imp_name, file_path):
     imp_name = imp_name.split('.', 1)[0].strip()
     base_path = dirname(file_path)
     base_path = join(base_path, imp_name)
+    # If there is no __init__.py next to the file its not in a package
+    # so can't be a relative import.
+    if not exists(join(dirname(base_path), '__init__.py')):
+        return False
     for ext in ['.py', pathsep, '.pyc', '.so', '.sl', '.pyd']:
         if exists(base_path + ext):
             return True
-- 
cgit v1.2.1