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
  ........
................
		
	
			
		
			
				
	
	
		
			107 lines
		
	
	
	
		
			3.7 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			107 lines
		
	
	
	
		
			3.7 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| # Copyright 2007 Google, Inc. All Rights Reserved.
 | |
| # Licensed to PSF under a Contributor Agreement.
 | |
| 
 | |
| """Fixer for dict methods.
 | |
| 
 | |
| d.keys() -> list(d.keys())
 | |
| d.items() -> list(d.items())
 | |
| d.values() -> list(d.values())
 | |
| 
 | |
| d.iterkeys() -> iter(d.keys())
 | |
| d.iteritems() -> iter(d.items())
 | |
| d.itervalues() -> iter(d.values())
 | |
| 
 | |
| d.viewkeys() -> d.keys()
 | |
| d.viewitems() -> d.items()
 | |
| d.viewvalues() -> d.values()
 | |
| 
 | |
| Except in certain very specific contexts: the iter() can be dropped
 | |
| when the context is list(), sorted(), iter() or for...in; the list()
 | |
| can be dropped when the context is list() or sorted() (but not iter()
 | |
| or for...in!). Special contexts that apply to both: list(), sorted(), tuple()
 | |
| set(), any(), all(), sum().
 | |
| 
 | |
| Note: iter(d.keys()) could be written as iter(d) but since the
 | |
| original d.iterkeys() was also redundant we don't fix this.  And there
 | |
| are (rare) contexts where it makes a difference (e.g. when passing it
 | |
| as an argument to a function that introspects the argument).
 | |
| """
 | |
| 
 | |
| # Local imports
 | |
| from .. import pytree
 | |
| from .. import patcomp
 | |
| from ..pgen2 import token
 | |
| from .. import fixer_base
 | |
| from ..fixer_util import Name, Call, LParen, RParen, ArgList, Dot
 | |
| from .. import fixer_util
 | |
| 
 | |
| 
 | |
| iter_exempt = fixer_util.consuming_calls | set(["iter"])
 | |
| 
 | |
| 
 | |
| class FixDict(fixer_base.BaseFix):
 | |
|     BM_compatible = True
 | |
| 
 | |
|     PATTERN = """
 | |
|     power< head=any+
 | |
|          trailer< '.' method=('keys'|'items'|'values'|
 | |
|                               'iterkeys'|'iteritems'|'itervalues'|
 | |
|                               'viewkeys'|'viewitems'|'viewvalues') >
 | |
|          parens=trailer< '(' ')' >
 | |
|          tail=any*
 | |
|     >
 | |
|     """
 | |
| 
 | |
|     def transform(self, node, results):
 | |
|         head = results["head"]
 | |
|         method = results["method"][0] # Extract node for method name
 | |
|         tail = results["tail"]
 | |
|         syms = self.syms
 | |
|         method_name = method.value
 | |
|         isiter = method_name.startswith("iter")
 | |
|         isview = method_name.startswith("view")
 | |
|         if isiter or isview:
 | |
|             method_name = method_name[4:]
 | |
|         assert method_name in ("keys", "items", "values"), repr(method)
 | |
|         head = [n.clone() for n in head]
 | |
|         tail = [n.clone() for n in tail]
 | |
|         special = not tail and self.in_special_context(node, isiter)
 | |
|         args = head + [pytree.Node(syms.trailer,
 | |
|                                    [Dot(),
 | |
|                                     Name(method_name,
 | |
|                                          prefix=method.prefix)]),
 | |
|                        results["parens"].clone()]
 | |
|         new = pytree.Node(syms.power, args)
 | |
|         if not (special or isview):
 | |
|             new.prefix = ""
 | |
|             new = Call(Name("iter" if isiter else "list"), [new])
 | |
|         if tail:
 | |
|             new = pytree.Node(syms.power, [new] + tail)
 | |
|         new.prefix = node.prefix
 | |
|         return new
 | |
| 
 | |
|     P1 = "power< func=NAME trailer< '(' node=any ')' > any* >"
 | |
|     p1 = patcomp.compile_pattern(P1)
 | |
| 
 | |
|     P2 = """for_stmt< 'for' any 'in' node=any ':' any* >
 | |
|             | comp_for< 'for' any 'in' node=any any* >
 | |
|          """
 | |
|     p2 = patcomp.compile_pattern(P2)
 | |
| 
 | |
|     def in_special_context(self, node, isiter):
 | |
|         if node.parent is None:
 | |
|             return False
 | |
|         results = {}
 | |
|         if (node.parent.parent is not None and
 | |
|                self.p1.match(node.parent.parent, results) and
 | |
|                results["node"] is node):
 | |
|             if isiter:
 | |
|                 # iter(d.iterkeys()) -> iter(d.keys()), etc.
 | |
|                 return results["func"].value in iter_exempt
 | |
|             else:
 | |
|                 # list(d.keys()) -> list(d.keys()), etc.
 | |
|                 return results["func"].value in fixer_util.consuming_calls
 | |
|         if not isiter:
 | |
|             return False
 | |
|         # for ... in d.iterkeys() -> for ... in d.keys(), etc.
 | |
|         return self.p2.match(node.parent, results) and results["node"] is node
 |