mirror of
https://github.com/python/cpython.git
synced 2025-07-24 03:35:53 +00:00
7d8d9a588c
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66797 | benjamin.peterson | 2008-10-04 15:55:50 -0500 (Sat, 04 Oct 2008) | 19 lines
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
........
................
64 lines
2 KiB
Python
64 lines
2 KiB
Python
"""Fixer for import statements.
|
|
If spam is being imported from the local directory, this import:
|
|
from spam import eggs
|
|
Becomes:
|
|
from .spam import eggs
|
|
|
|
And this import:
|
|
import spam
|
|
Becomes:
|
|
from . import spam
|
|
"""
|
|
|
|
# Local imports
|
|
from .. import fixer_base
|
|
from os.path import dirname, join, exists, pathsep
|
|
from ..fixer_util import FromImport
|
|
|
|
class FixImport(fixer_base.BaseFix):
|
|
|
|
PATTERN = """
|
|
import_from< type='from' imp=any 'import' any >
|
|
|
|
|
import_name< type='import' imp=any >
|
|
"""
|
|
|
|
def transform(self, node, results):
|
|
imp = results['imp']
|
|
|
|
if str(imp).startswith('.'):
|
|
# Already a new-style import
|
|
return
|
|
|
|
if not probably_a_local_import(str(imp), self.filename):
|
|
# I guess this is a global import -- skip it!
|
|
return
|
|
|
|
if results['type'].value == 'from':
|
|
# Some imps are top-level (eg: 'import ham')
|
|
# some are first level (eg: 'import ham.eggs')
|
|
# some are third level (eg: 'import ham.eggs as spam')
|
|
# Hence, the loop
|
|
while not hasattr(imp, 'value'):
|
|
imp = imp.children[0]
|
|
imp.value = "." + imp.value
|
|
node.changed()
|
|
else:
|
|
new = FromImport('.', getattr(imp, 'content', None) or [imp])
|
|
new.set_prefix(node.get_prefix())
|
|
node = new
|
|
return node
|
|
|
|
def probably_a_local_import(imp_name, file_path):
|
|
# Must be stripped because the right space is included by the parser
|
|
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
|
|
return False
|