mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 02:15:10 +00:00 
			
		
		
		
	 f37eb3a184
			
		
	
	
		f37eb3a184
		
	
	
	
	
		
			
			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 ........
		
			
				
	
	
		
			152 lines
		
	
	
	
		
			4.8 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			152 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 = ""
 | |
|         T.prefix = " "
 | |
|         test = Call(Name("isinstance"), [x, Comma(), T])
 | |
|         if "n" in results:
 | |
|             test.prefix = " "
 | |
|             test = Node(syms.not_test, [Name("not"), test])
 | |
|         test.prefix = node.prefix
 | |
|         return test
 | |
| 
 | |
|     def transform_while(self, node, results):
 | |
|         one = results["while"]
 | |
|         one.replace(Name("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("sorted", prefix=list_call.prefix))
 | |
|         elif simple_expr:
 | |
|             new = simple_expr.clone()
 | |
|             new.prefix = ""
 | |
|             simple_expr.replace(Call(Name("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 "\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("\n")[0], next_stmt[0].prefix)
 | |
|                 next_stmt[0].prefix = "\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("\n")[0]
 |