mirror of
https://github.com/python/cpython.git
synced 2024-12-01 03:01:36 +01:00
b0871cac11
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r85510 | benjamin.peterson | 2010-10-14 18:00:04 -0500 (Thu, 14 Oct 2010) | 61 lines Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line wrap with parens ........ r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line use parens ........ r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line things which use touch_import should be pre order ........ r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers. ........ r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line allow star_expr in testlist_gexp ........ r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line wrap long line ........ r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line cleanup ........ r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line when there's a None value and a traceback, don't call type with it #9661 ........ r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code. ........ r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line fix urllib fixer with multiple as imports on a line #10069 ........ r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line stop abusing docstrings ........ r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line kill sibling import ........ r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line remove trailing whitespace ........ r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line typo ........ ................
100 lines
3.2 KiB
Python
100 lines
3.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, sep
|
|
from ..fixer_util import FromImport, syms, token
|
|
|
|
|
|
def traverse_imports(names):
|
|
"""
|
|
Walks over all the names imported in a dotted_as_names node.
|
|
"""
|
|
pending = [names]
|
|
while pending:
|
|
node = pending.pop()
|
|
if node.type == token.NAME:
|
|
yield node.value
|
|
elif node.type == syms.dotted_name:
|
|
yield "".join([ch.value for ch in node.children])
|
|
elif node.type == syms.dotted_as_name:
|
|
pending.append(node.children[0])
|
|
elif node.type == syms.dotted_as_names:
|
|
pending.extend(node.children[::-2])
|
|
else:
|
|
raise AssertionError("unkown node type")
|
|
|
|
|
|
class FixImport(fixer_base.BaseFix):
|
|
BM_compatible = True
|
|
|
|
PATTERN = """
|
|
import_from< 'from' imp=any 'import' ['('] any [')'] >
|
|
|
|
|
import_name< 'import' imp=any >
|
|
"""
|
|
|
|
def start_tree(self, tree, name):
|
|
super(FixImport, self).start_tree(tree, name)
|
|
self.skip = "absolute_import" in tree.future_features
|
|
|
|
def transform(self, node, results):
|
|
if self.skip:
|
|
return
|
|
imp = results['imp']
|
|
|
|
if node.type == syms.import_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]
|
|
if self.probably_a_local_import(imp.value):
|
|
imp.value = "." + imp.value
|
|
imp.changed()
|
|
else:
|
|
have_local = False
|
|
have_absolute = False
|
|
for mod_name in traverse_imports(imp):
|
|
if self.probably_a_local_import(mod_name):
|
|
have_local = True
|
|
else:
|
|
have_absolute = True
|
|
if have_absolute:
|
|
if have_local:
|
|
# We won't handle both sibling and absolute imports in the
|
|
# same statement at the moment.
|
|
self.warning(node, "absolute and local imports together")
|
|
return
|
|
|
|
new = FromImport(".", [imp])
|
|
new.prefix = node.prefix
|
|
return new
|
|
|
|
def probably_a_local_import(self, imp_name):
|
|
if imp_name.startswith("."):
|
|
# Relative imports are certainly not local imports.
|
|
return False
|
|
imp_name = imp_name.split(".", 1)[0]
|
|
base_path = dirname(self.filename)
|
|
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", sep, ".pyc", ".so", ".sl", ".pyd"]:
|
|
if exists(base_path + ext):
|
|
return True
|
|
return False
|