mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	 b0871cac11
			
		
	
	
		b0871cac11
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
  r85510 | benjamin.peterson | 2010-10-14 18:00:04 -0500 (Thu, 14 Oct 2010) | 61 lines
  Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line
    wrap with parens
  ........
    r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line
    use parens
  ........
    r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line
    things which use touch_import should be pre order
  ........
    r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines
    This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers.
  ........
    r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line
    allow star_expr in testlist_gexp
  ........
    r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line
    wrap long line
  ........
    r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line
    cleanup
  ........
    r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line
    when there's a None value and a traceback, don't call type with it #9661
  ........
    r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines
    Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code.
  ........
    r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line
    fix urllib fixer with multiple as imports on a line #10069
  ........
    r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line
    stop abusing docstrings
  ........
    r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line
    kill sibling import
  ........
    r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line
    remove trailing whitespace
  ........
    r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line
    typo
  ........
................
		
	
			
		
			
				
	
	
		
			91 lines
		
	
	
	
		
			3 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			91 lines
		
	
	
	
		
			3 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):
 | |
|     BM_compatible = True
 | |
| 
 | |
|     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' trailer< '(' [arglist=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["xp"].clone(),
 | |
|                            results["fp"].clone(),
 | |
|                            results["it"].clone())
 | |
|         else:
 | |
|             if "map_none" in results:
 | |
|                 new = results["arg"].clone()
 | |
|             else:
 | |
|                 if "arglist" in results:
 | |
|                     args = results["arglist"]
 | |
|                     if args.type == syms.arglist and \
 | |
|                        args.children[0].type == token.NAME and \
 | |
|                        args.children[0].value == "None":
 | |
|                         self.warning(node, "cannot convert map(None, ...) "
 | |
|                                      "with multiple arguments because map() "
 | |
|                                      "now truncates to the shortest sequence")
 | |
|                         return
 | |
|                 if in_special_context(node):
 | |
|                     return None
 | |
|                 new = node.clone()
 | |
|             new.prefix = ""
 | |
|             new = Call(Name("list"), [new])
 | |
|         new.prefix = node.prefix
 | |
|         return new
 |