mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	 2c3ac6b875
			
		
	
	
		2c3ac6b875
		
	
	
	
	
		
			
			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
  ........
................
		
	
			
		
			
				
	
	
		
			82 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			82 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| # Copyright 2007 Google, Inc. All Rights Reserved.
 | |
| # Licensed to PSF under a Contributor Agreement.
 | |
| 
 | |
| """Fixer that changes map(F, ...) into list(map(F, ...)) unless there
 | |
| exists a 'from future_builtins import map' statement in the top-level
 | |
| namespace.
 | |
| 
 | |
| As a special case, map(None, X) is changed into list(X).  (This is
 | |
| necessary because the semantics are changed in this case -- the new
 | |
| map(None, X) is equivalent to [(x,) for x in X].)
 | |
| 
 | |
| We avoid the transformation (except for the special case mentioned
 | |
| above) if the map() call is directly contained in iter(<>), list(<>),
 | |
| tuple(<>), sorted(<>), ...join(<>), or for V in <>:.
 | |
| 
 | |
| NOTE: This is still not correct if the original code was depending on
 | |
| map(F, X, Y, ...) to go on until the longest argument is exhausted,
 | |
| substituting None for missing values -- like zip(), it now stops as
 | |
| soon as the shortest argument is exhausted.
 | |
| """
 | |
| 
 | |
| # Local imports
 | |
| from ..pgen2 import token
 | |
| from .. import fixer_base
 | |
| from ..fixer_util import Name, Call, ListComp, in_special_context
 | |
| from ..pygram import python_symbols as syms
 | |
| 
 | |
| class FixMap(fixer_base.ConditionalFix):
 | |
| 
 | |
|     PATTERN = """
 | |
|     map_none=power<
 | |
|         'map'
 | |
|         trailer< '(' arglist< 'None' ',' arg=any [','] > ')' >
 | |
|     >
 | |
|     |
 | |
|     map_lambda=power<
 | |
|         'map'
 | |
|         trailer<
 | |
|             '('
 | |
|             arglist<
 | |
|                 lambdef< 'lambda'
 | |
|                          (fp=NAME | vfpdef< '(' fp=NAME ')'> ) ':' xp=any
 | |
|                 >
 | |
|                 ','
 | |
|                 it=any
 | |
|             >
 | |
|             ')'
 | |
|         >
 | |
|     >
 | |
|     |
 | |
|     power<
 | |
|         'map'
 | |
|         args=trailer< '(' [any] ')' >
 | |
|     >
 | |
|     """
 | |
| 
 | |
|     skip_on = 'future_builtins.map'
 | |
| 
 | |
|     def transform(self, node, results):
 | |
|         if self.should_skip(node):
 | |
|             return
 | |
| 
 | |
|         if node.parent.type == syms.simple_stmt:
 | |
|             self.warning(node, "You should use a for loop here")
 | |
|             new = node.clone()
 | |
|             new.prefix = ""
 | |
|             new = Call(Name("list"), [new])
 | |
|         elif "map_lambda" in results:
 | |
|             new = ListComp(results.get("xp").clone(),
 | |
|                            results.get("fp").clone(),
 | |
|                            results.get("it").clone())
 | |
|         else:
 | |
|             if "map_none" in results:
 | |
|                 new = results["arg"].clone()
 | |
|             else:
 | |
|                 if in_special_context(node):
 | |
|                     return None
 | |
|                 new = node.clone()
 | |
|             new.prefix = ""
 | |
|             new = Call(Name("list"), [new])
 | |
|         new.prefix = node.prefix
 | |
|         return new
 |