mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 21:51:50 +00:00 
			
		
		
		
	 f9e7d5421a
			
		
	
	
		f9e7d5421a
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r74359 | benjamin.peterson | 2009-08-12 17:23:13 -0500 (Wed, 12 Aug 2009) | 1 line don't pass the deprecated print_function option ........ r75081 | benjamin.peterson | 2009-09-26 22:02:57 -0500 (Sat, 26 Sep 2009) | 1 line let 2to3 work with extended iterable unpacking ........ r75088 | benjamin.peterson | 2009-09-27 11:25:21 -0500 (Sun, 27 Sep 2009) | 1 line look on the type only for __call__ ........ r75213 | benjamin.peterson | 2009-10-03 10:09:46 -0500 (Sat, 03 Oct 2009) | 5 lines revert 75212; it's not correct People can use isinstance(x, collections.Callable) if they expect objects with __call__ in their instance dictionaries. ........ r75278 | benjamin.peterson | 2009-10-07 16:25:56 -0500 (Wed, 07 Oct 2009) | 4 lines fix whitespace problems with fix_idioms #3563 Patch by Joe Amenta. ........ r75303 | benjamin.peterson | 2009-10-09 16:59:11 -0500 (Fri, 09 Oct 2009) | 1 line port latin-1 and utf-8 cookie improvements ........ r75427 | benjamin.peterson | 2009-10-14 20:35:57 -0500 (Wed, 14 Oct 2009) | 1 line force floor division ........ r75428 | benjamin.peterson | 2009-10-14 20:39:21 -0500 (Wed, 14 Oct 2009) | 1 line silence -3 warnings about __hash__ ........ r75734 | benjamin.peterson | 2009-10-26 16:25:53 -0500 (Mon, 26 Oct 2009) | 2 lines warn on map(None, ...) with more than 2 arguments #7203 ........ r75735 | benjamin.peterson | 2009-10-26 16:28:25 -0500 (Mon, 26 Oct 2009) | 1 line remove unused result ........ r75736 | benjamin.peterson | 2009-10-26 16:29:02 -0500 (Mon, 26 Oct 2009) | 1 line using get() here is a bit pointless ........ r75865 | benjamin.peterson | 2009-10-27 15:49:00 -0500 (Tue, 27 Oct 2009) | 1 line explain reason for warning ........ r76059 | benjamin.peterson | 2009-11-02 11:43:47 -0600 (Mon, 02 Nov 2009) | 1 line tuples are no longer used for children ........ r76060 | benjamin.peterson | 2009-11-02 11:55:40 -0600 (Mon, 02 Nov 2009) | 1 line revert r76059; apparently some fixers rely on Leaf no () for children ........ r76061 | benjamin.peterson | 2009-11-02 12:06:17 -0600 (Mon, 02 Nov 2009) | 1 line make fix_tuple_params keep the tree valid #7253 ........
		
			
				
	
	
		
			153 lines
		
	
	
	
		
			4.8 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			153 lines
		
	
	
	
		
			4.8 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| """Adjust some old Python 2 idioms to their modern counterparts.
 | |
| 
 | |
| * Change some type comparisons to isinstance() calls:
 | |
|     type(x) == T -> isinstance(x, T)
 | |
|     type(x) is T -> isinstance(x, T)
 | |
|     type(x) != T -> not isinstance(x, T)
 | |
|     type(x) is not T -> not isinstance(x, T)
 | |
| 
 | |
| * Change "while 1:" into "while True:".
 | |
| 
 | |
| * Change both
 | |
| 
 | |
|     v = list(EXPR)
 | |
|     v.sort()
 | |
|     foo(v)
 | |
| 
 | |
| and the more general
 | |
| 
 | |
|     v = EXPR
 | |
|     v.sort()
 | |
|     foo(v)
 | |
| 
 | |
| into
 | |
| 
 | |
|     v = sorted(EXPR)
 | |
|     foo(v)
 | |
| """
 | |
| # Author: Jacques Frechet, Collin Winter
 | |
| 
 | |
| # Local imports
 | |
| from .. import fixer_base
 | |
| from ..fixer_util import Call, Comma, Name, Node, BlankLine, syms
 | |
| 
 | |
| CMP = "(n='!=' | '==' | 'is' | n=comp_op< 'is' 'not' >)"
 | |
| TYPE = "power< 'type' trailer< '(' x=any ')' > >"
 | |
| 
 | |
| class FixIdioms(fixer_base.BaseFix):
 | |
| 
 | |
|     explicit = True # The user must ask for this fixer
 | |
| 
 | |
|     PATTERN = r"""
 | |
|         isinstance=comparison< %s %s T=any >
 | |
|         |
 | |
|         isinstance=comparison< T=any %s %s >
 | |
|         |
 | |
|         while_stmt< 'while' while='1' ':' any+ >
 | |
|         |
 | |
|         sorted=any<
 | |
|             any*
 | |
|             simple_stmt<
 | |
|               expr_stmt< id1=any '='
 | |
|                          power< list='list' trailer< '(' (not arglist<any+>) any ')' > >
 | |
|               >
 | |
|               '\n'
 | |
|             >
 | |
|             sort=
 | |
|             simple_stmt<
 | |
|               power< id2=any
 | |
|                      trailer< '.' 'sort' > trailer< '(' ')' >
 | |
|               >
 | |
|               '\n'
 | |
|             >
 | |
|             next=any*
 | |
|         >
 | |
|         |
 | |
|         sorted=any<
 | |
|             any*
 | |
|             simple_stmt< expr_stmt< id1=any '=' expr=any > '\n' >
 | |
|             sort=
 | |
|             simple_stmt<
 | |
|               power< id2=any
 | |
|                      trailer< '.' 'sort' > trailer< '(' ')' >
 | |
|               >
 | |
|               '\n'
 | |
|             >
 | |
|             next=any*
 | |
|         >
 | |
|     """ % (TYPE, CMP, CMP, TYPE)
 | |
| 
 | |
|     def match(self, node):
 | |
|         r = super(FixIdioms, self).match(node)
 | |
|         # If we've matched one of the sort/sorted subpatterns above, we
 | |
|         # want to reject matches where the initial assignment and the
 | |
|         # subsequent .sort() call involve different identifiers.
 | |
|         if r and "sorted" in r:
 | |
|             if r["id1"] == r["id2"]:
 | |
|                 return r
 | |
|             return None
 | |
|         return r
 | |
| 
 | |
|     def transform(self, node, results):
 | |
|         if "isinstance" in results:
 | |
|             return self.transform_isinstance(node, results)
 | |
|         elif "while" in results:
 | |
|             return self.transform_while(node, results)
 | |
|         elif "sorted" in results:
 | |
|             return self.transform_sort(node, results)
 | |
|         else:
 | |
|             raise RuntimeError("Invalid match")
 | |
| 
 | |
|     def transform_isinstance(self, node, results):
 | |
|         x = results["x"].clone() # The thing inside of type()
 | |
|         T = results["T"].clone() # The type being compared against
 | |
|         x.prefix = u""
 | |
|         T.prefix = u" "
 | |
|         test = Call(Name(u"isinstance"), [x, Comma(), T])
 | |
|         if "n" in results:
 | |
|             test.prefix = u" "
 | |
|             test = Node(syms.not_test, [Name(u"not"), test])
 | |
|         test.prefix = node.prefix
 | |
|         return test
 | |
| 
 | |
|     def transform_while(self, node, results):
 | |
|         one = results["while"]
 | |
|         one.replace(Name(u"True", prefix=one.prefix))
 | |
| 
 | |
|     def transform_sort(self, node, results):
 | |
|         sort_stmt = results["sort"]
 | |
|         next_stmt = results["next"]
 | |
|         list_call = results.get("list")
 | |
|         simple_expr = results.get("expr")
 | |
| 
 | |
|         if list_call:
 | |
|             list_call.replace(Name(u"sorted", prefix=list_call.prefix))
 | |
|         elif simple_expr:
 | |
|             new = simple_expr.clone()
 | |
|             new.prefix = u""
 | |
|             simple_expr.replace(Call(Name(u"sorted"), [new],
 | |
|                                      prefix=simple_expr.prefix))
 | |
|         else:
 | |
|             raise RuntimeError("should not have reached here")
 | |
|         sort_stmt.remove()
 | |
| 
 | |
|         btwn = sort_stmt.prefix
 | |
|         # Keep any prefix lines between the sort_stmt and the list_call and
 | |
|         # shove them right after the sorted() call.
 | |
|         if u"\n" in btwn:
 | |
|             if next_stmt:
 | |
|                 # The new prefix should be everything from the sort_stmt's
 | |
|                 # prefix up to the last newline, then the old prefix after a new
 | |
|                 # line.
 | |
|                 prefix_lines = (btwn.rpartition(u"\n")[0], next_stmt[0].prefix)
 | |
|                 next_stmt[0].prefix = u"\n".join(prefix_lines)
 | |
|             else:
 | |
|                 assert list_call.parent
 | |
|                 assert list_call.next_sibling is None
 | |
|                 # Put a blank line after list_call and set its prefix.
 | |
|                 end_line = BlankLine()
 | |
|                 list_call.parent.append_child(end_line)
 | |
|                 assert list_call.next_sibling is end_line
 | |
|                 # The new prefix should be everything up to the first new line
 | |
|                 # of sort_stmt's prefix.
 | |
|                 end_line.prefix = btwn.rpartition(u"\n")[0]
 |