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
  ........
................
		
	
			
		
			
				
	
	
		
			134 lines
		
	
	
	
		
			3.8 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			134 lines
		
	
	
	
		
			3.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, 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()
 | |
|         if next_stmt:
 | |
|             next_stmt[0].prefix = sort_stmt.prefix
 |