mirror of
https://github.com/python/cpython.git
synced 2025-10-31 13:41:24 +00:00
5dfad9dc9a
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r79911 | benjamin.peterson | 2010-04-09 15:38:53 -0500 (Fri, 09 Apr 2010) | 1 line use absolute import ........ r79916 | benjamin.peterson | 2010-04-09 16:05:21 -0500 (Fri, 09 Apr 2010) | 1 line generalize detection of __future__ imports and attach them to the tree ........ r79917 | benjamin.peterson | 2010-04-09 16:11:44 -0500 (Fri, 09 Apr 2010) | 1 line don't try to 'fix' relative imports when absolute_import is enabled #8858 ........ r80018 | benjamin.peterson | 2010-04-12 16:12:12 -0500 (Mon, 12 Apr 2010) | 4 lines prevent diffs from being mangled is multiprocess mode #6409 Patch by George Boutsioukis. ........ r80418 | benjamin.peterson | 2010-04-23 16:00:03 -0500 (Fri, 23 Apr 2010) | 1 line remove unhelpful description ........ r80572 | benjamin.peterson | 2010-04-27 20:33:54 -0500 (Tue, 27 Apr 2010) | 1 line use unicode literals ........ r80573 | jeffrey.yasskin | 2010-04-27 23:08:27 -0500 (Tue, 27 Apr 2010) | 6 lines Don't transform imports that are already relative. 2to3 turned from . import refactor into from .. import refactor which broke the transformation of 2to3 itself. ........ r80635 | benjamin.peterson | 2010-04-29 16:02:23 -0500 (Thu, 29 Apr 2010) | 1 line remove imports ........ r80636 | benjamin.peterson | 2010-04-29 16:02:41 -0500 (Thu, 29 Apr 2010) | 1 line unicode literal ........ r80637 | benjamin.peterson | 2010-04-29 16:03:42 -0500 (Thu, 29 Apr 2010) | 1 line must pass a string to Number ........ r80638 | benjamin.peterson | 2010-04-29 16:05:34 -0500 (Thu, 29 Apr 2010) | 1 line unicode literals ........ r80639 | benjamin.peterson | 2010-04-29 16:06:09 -0500 (Thu, 29 Apr 2010) | 1 line pass string to Number ........ r80668 | jeffrey.yasskin | 2010-04-30 18:02:47 -0500 (Fri, 30 Apr 2010) | 4 lines Make 2to3 run under Python 2.5 so that the benchmark suite at http://hg.python.org/benchmarks/ can use it and still run on implementations that haven't gotten to 2.6 yet. Fixes issue 8566. ........ r80922 | benjamin.peterson | 2010-05-07 11:06:25 -0500 (Fri, 07 May 2010) | 1 line prevent xrange transformation from wrapping range calls it produces in list ........
98 lines
3.2 KiB
Python
98 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):
|
|
|
|
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 = u"." + 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(u".", [imp])
|
|
new.prefix = node.prefix
|
|
return new
|
|
|
|
def probably_a_local_import(self, imp_name):
|
|
if imp_name.startswith(u"."):
|
|
# Relative imports are certainly not local imports.
|
|
return False
|
|
imp_name = imp_name.split(u".", 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
|