mirror of
https://github.com/python/cpython.git
synced 2025-11-10 14:31:24 +00:00
svn+ssh://pythondev@svn.python.org/python/trunk
................
r73370 | benjamin.peterson | 2009-06-11 17:06:46 -0500 (Thu, 11 Jun 2009) | 105 lines
Merged revisions 72523,72950-72951,72994,73003,73033,73036-73040,73091-73093,73096,73179-73181,73192,73231,73244,73255-73256,73365 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r72523 | benjamin.peterson | 2009-05-09 14:42:26 -0500 (Sat, 09 May 2009) | 1 line
remove parenthesis
........
r72950 | benjamin.peterson | 2009-05-26 18:19:45 -0500 (Tue, 26 May 2009) | 1 line
remove unused imports
........
r72951 | benjamin.peterson | 2009-05-26 18:27:00 -0500 (Tue, 26 May 2009) | 1 line
this is no longer executable
........
r72994 | benjamin.peterson | 2009-05-28 15:32:54 -0500 (Thu, 28 May 2009) | 1 line
fix test_all_fixers on Windows #6134
........
r73003 | benjamin.peterson | 2009-05-28 21:57:28 -0500 (Thu, 28 May 2009) | 4 lines
make 2to3 test utilities easier to use with other applications (3to2)
Patch by Joe Amenta
........
r73033 | benjamin.peterson | 2009-05-29 16:58:32 -0500 (Fri, 29 May 2009) | 1 line
update grammar for multi with statement
........
r73036 | benjamin.peterson | 2009-05-29 17:33:20 -0500 (Fri, 29 May 2009) | 1 line
simplify fix_unicode
........
r73037 | benjamin.peterson | 2009-05-29 17:53:03 -0500 (Fri, 29 May 2009) | 1 line
add custom error for pattern syntax errors
........
r73038 | benjamin.peterson | 2009-05-29 17:55:00 -0500 (Fri, 29 May 2009) | 1 line
complain if details are attached to a token
........
r73039 | benjamin.peterson | 2009-05-29 18:00:28 -0500 (Fri, 29 May 2009) | 1 line
add a test for whitespace
........
r73040 | benjamin.peterson | 2009-05-29 18:01:17 -0500 (Fri, 29 May 2009) | 1 line
a fix for emacs highlighting
........
r73091 | benjamin.peterson | 2009-05-31 20:55:25 -0500 (Sun, 31 May 2009) | 1 line
deprecate set_prefix() and get_prefix() in favor of a prefix property
........
r73092 | benjamin.peterson | 2009-05-31 21:00:51 -0500 (Sun, 31 May 2009) | 1 line
change hideous java naming scheme
........
r73093 | benjamin.peterson | 2009-05-31 21:01:39 -0500 (Sun, 31 May 2009) | 1 line
remove dated comment
........
r73096 | benjamin.peterson | 2009-05-31 21:40:53 -0500 (Sun, 31 May 2009) | 1 line
group tests
........
r73179 | benjamin.peterson | 2009-06-03 13:09:53 -0500 (Wed, 03 Jun 2009) | 1 line
handle the case where there's multiple trailers #6185
........
r73180 | benjamin.peterson | 2009-06-03 13:18:05 -0500 (Wed, 03 Jun 2009) | 1 line
scrap __main__ section
........
r73181 | benjamin.peterson | 2009-06-03 13:24:48 -0500 (Wed, 03 Jun 2009) | 1 line
remove shebang lines and __main__ sections
........
r73192 | benjamin.peterson | 2009-06-03 19:16:30 -0500 (Wed, 03 Jun 2009) | 4 lines
actually test something here
Thanks to Joe Amenta for noticing.y
........
r73231 | benjamin.peterson | 2009-06-04 13:38:50 -0500 (Thu, 04 Jun 2009) | 1 line
remove unused variable
........
r73244 | benjamin.peterson | 2009-06-05 08:39:25 -0500 (Fri, 05 Jun 2009) | 1 line
allow fixers to give different options in setUp
........
r73255 | benjamin.peterson | 2009-06-06 11:23:46 -0500 (Sat, 06 Jun 2009) | 1 line
fix the except fixer on one line suites #6222
........
r73256 | benjamin.peterson | 2009-06-06 11:27:40 -0500 (Sat, 06 Jun 2009) | 1 line
test one-line else and finally clauses
........
r73365 | benjamin.peterson | 2009-06-11 17:01:32 -0500 (Thu, 11 Jun 2009) | 1 line
normalize whitespace
........
................
90 lines
2.9 KiB
Python
90 lines
2.9 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, 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 transform(self, node, results):
|
|
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()
|
|
return node
|
|
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):
|
|
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', pathsep, '.pyc', '.so', '.sl', '.pyd']:
|
|
if exists(base_path + ext):
|
|
return True
|
|
return False
|