mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 05:31:20 +00:00 
			
		
		
		
	 3059b00f65
			
		
	
	
		3059b00f65
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/trunk
................
  r74114 | benjamin.peterson | 2009-07-20 10:33:09 -0500 (Mon, 20 Jul 2009) | 110 lines
  Merged revisions 73771,73811,73840,73842,73848-73849,73861,73957-73960,73964-73969,73972-73974,73977,73981,73984,74065,74113 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line
    force the imports fixer to be run after the import one #6400
  ........
    r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line
    check for sep, not pathsep when looking for a subpackage #6408
  ........
    r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line
    don't print diffs by default; it's annoying
  ........
    r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line
    complain when not showing diffs or writing
  ........
    r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines
    Fix test_refactor_stdin to handle print_output() method with 4 arguments.
  ........
    r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines
    Issue 2370: Add fixer for the removal of operator.isCallable() and
    operator.sequenceIncludes().
    Patch contributed by Jeff Balogh (and updated by me).
  ........
    r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line
    cleanup and use unicode where appropiate
  ........
    r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line
    fix calls to str() with unicode()
  ........
    r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line
    more str() -> unicode()
  ........
    r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line
    add tests for refactor_dir()
  ........
    r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line
    don't parse files just because they end with 'py' (no dot)
  ........
    r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line
    simplify
  ........
    r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line
    remove usage of get_prefix()
  ........
    r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line
    revert unintended change in 73965
  ........
    r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line
    avoid expensive checks and assume the node did change
  ........
    r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line
    use a regular dict for the heads to avoid adding lists in the loop
  ........
    r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line
    prefix headnode functions with '_'
  ........
    r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line
    try to make the head node dict as sparse as possible
  ........
    r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line
    a better idea; add an option to *not* print diffs
  ........
    r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line
    add space
  ........
    r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line
    update get_headnode_dict tests for recent changes
  ........
    r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines
    detect when "from __future__ import print_function" is given
    Deprecate the 'print_function' option and the -p flag
  ........
    r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line
    add tests for Call; thanks Joe Amenta
  ........
    r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line
    pathname2url and url2pathname are in urllib.request not urllib.parse #6496
  ........
    r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line
    fix deprecation warnings in tests
  ........
................
		
	
			
		
			
				
	
	
		
			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, 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 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', sep, '.pyc', '.so', '.sl', '.pyd']:
 | |
|             if exists(base_path + ext):
 | |
|                 return True
 | |
|         return False
 |