2to3/fix_imports.py: Use UNIX new-line characters.

This commit is contained in:
Valentin Lorentz 2013-07-16 23:00:20 +02:00
parent 29dc1438a0
commit 3bab899146

View File

@ -1,106 +1,106 @@
"""Fixer for import statements. """Fixer for import statements.
If spam is being imported from the local directory, this import: If spam is being imported from the local directory, this import:
from spam import eggs from spam import eggs
Becomes: Becomes:
from .spam import eggs from .spam import eggs
And this import: And this import:
import spam import spam
Becomes: Becomes:
from . import spam from . import spam
""" """
# Local imports # Local imports
from lib2to3 import fixer_base from lib2to3 import fixer_base
from os.path import dirname, join, exists, sep, split, isdir from os.path import dirname, join, exists, sep, split, isdir
from os import listdir from os import listdir
from lib2to3.fixer_util import FromImport, syms, token from lib2to3.fixer_util import FromImport, syms, token
def traverse_imports(names): def traverse_imports(names):
""" """
Walks over all the names imported in a dotted_as_names node. Walks over all the names imported in a dotted_as_names node.
""" """
pending = [names] pending = [names]
while pending: while pending:
node = pending.pop() node = pending.pop()
if node.type == token.NAME: if node.type == token.NAME:
yield node.value yield node.value
elif node.type == syms.dotted_name: elif node.type == syms.dotted_name:
yield "".join([ch.value for ch in node.children]) yield "".join([ch.value for ch in node.children])
elif node.type == syms.dotted_as_name: elif node.type == syms.dotted_as_name:
pending.append(node.children[0]) pending.append(node.children[0])
elif node.type == syms.dotted_as_names: elif node.type == syms.dotted_as_names:
pending.extend(node.children[::-2]) pending.extend(node.children[::-2])
else: else:
raise AssertionError("unkown node type") raise AssertionError("unkown node type")
class FixImport(fixer_base.BaseFix): class FixImport(fixer_base.BaseFix):
BM_compatible = True BM_compatible = True
PATTERN = """ PATTERN = """
import_from< 'from' imp=any 'import' ['('] any [')'] > import_from< 'from' imp=any 'import' ['('] any [')'] >
| |
import_name< 'import' imp=any > import_name< 'import' imp=any >
""" """
def start_tree(self, tree, name): def start_tree(self, tree, name):
super(FixImport, self).start_tree(tree, name) super(FixImport, self).start_tree(tree, name)
self.skip = "absolute_import" in tree.future_features self.skip = "absolute_import" in tree.future_features
def transform(self, node, results): def transform(self, node, results):
if self.skip: if self.skip:
return return
imp = results['imp'] imp = results['imp']
if node.type == syms.import_from: if node.type == syms.import_from:
# Some imps are top-level (eg: 'import ham') # Some imps are top-level (eg: 'import ham')
# some are first level (eg: 'import ham.eggs') # some are first level (eg: 'import ham.eggs')
# some are third level (eg: 'import ham.eggs as spam') # some are third level (eg: 'import ham.eggs as spam')
# Hence, the loop # Hence, the loop
while not hasattr(imp, 'value'): while not hasattr(imp, 'value'):
imp = imp.children[0] imp = imp.children[0]
if self.probably_a_local_import(imp.value): if self.probably_a_local_import(imp.value):
imp.value = "." + imp.value imp.value = "." + imp.value
imp.changed() imp.changed()
else: else:
have_local = False have_local = False
have_absolute = False have_absolute = False
for mod_name in traverse_imports(imp): for mod_name in traverse_imports(imp):
if self.probably_a_local_import(mod_name): if self.probably_a_local_import(mod_name):
have_local = True have_local = True
else: else:
have_absolute = True have_absolute = True
if have_absolute: if have_absolute:
if have_local: if have_local:
# We won't handle both sibling and absolute imports in the # We won't handle both sibling and absolute imports in the
# same statement at the moment. # same statement at the moment.
self.warning(node, "absolute and local imports together") self.warning(node, "absolute and local imports together")
return return
new = FromImport(".", [imp]) new = FromImport(".", [imp])
new.prefix = node.prefix new.prefix = node.prefix
return new return new
def probably_a_local_import(self, imp_name): def probably_a_local_import(self, imp_name):
if imp_name.startswith("."): if imp_name.startswith("."):
# Relative imports are certainly not local imports. # Relative imports are certainly not local imports.
return False return False
imp_name = imp_name.split(".", 1)[0] imp_name = imp_name.split(".", 1)[0]
base_path = dirname(self.filename) base_path = dirname(self.filename)
base_path = join(base_path, imp_name) base_path = join(base_path, imp_name)
# If there is no __init__.py next to the file its not in a package # If there is no __init__.py next to the file its not in a package
# so can't be a relative import. # so can't be a relative import.
if not exists(join(dirname(base_path), "__init__.py")): if not exists(join(dirname(base_path), "__init__.py")):
return False return False
(path, filename) = split(base_path) (path, filename) = split(base_path)
if isdir(base_path) and filename in listdir(path): if isdir(base_path) and filename in listdir(path):
# We use listdir too because of case-insensitivity on Windows # We use listdir too because of case-insensitivity on Windows
return True return True
for ext in [".py", ".pyc", ".so", ".sl", ".pyd"]: for ext in [".py", ".pyc", ".so", ".sl", ".pyd"]:
if (filename + ext) in listdir(path): if (filename + ext) in listdir(path):
# We use this instead of os.path.exists because of case-insensitivity # We use this instead of os.path.exists because of case-insensitivity
# on Windows # on Windows
return True return True
return False return False