mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	 6118040b7a
			
		
	
	
		6118040b7a
		
	
	
	
	
		
			
			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 ........
		
			
				
	
	
		
			92 lines
		
	
	
	
		
			3.2 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			92 lines
		
	
	
	
		
			3.2 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| """Fixer for except statements with named exceptions.
 | |
| 
 | |
| The following cases will be converted:
 | |
| 
 | |
| - "except E, T:" where T is a name:
 | |
| 
 | |
|     except E as T:
 | |
| 
 | |
| - "except E, T:" where T is not a name, tuple or list:
 | |
| 
 | |
|         except E as t:
 | |
|             T = t
 | |
| 
 | |
|     This is done because the target of an "except" clause must be a
 | |
|     name.
 | |
| 
 | |
| - "except E, T:" where T is a tuple or list literal:
 | |
| 
 | |
|         except E as t:
 | |
|             T = t.args
 | |
| """
 | |
| # Author: Collin Winter
 | |
| 
 | |
| # Local imports
 | |
| from .. import pytree
 | |
| from ..pgen2 import token
 | |
| from .. import fixer_base
 | |
| from ..fixer_util import Assign, Attr, Name, is_tuple, is_list, syms
 | |
| 
 | |
| def find_excepts(nodes):
 | |
|     for i, n in enumerate(nodes):
 | |
|         if n.type == syms.except_clause:
 | |
|             if n.children[0].value == u'except':
 | |
|                 yield (n, nodes[i+2])
 | |
| 
 | |
| class FixExcept(fixer_base.BaseFix):
 | |
| 
 | |
|     PATTERN = """
 | |
|     try_stmt< 'try' ':' (simple_stmt | suite)
 | |
|                   cleanup=(except_clause ':' (simple_stmt | suite))+
 | |
|                   tail=(['except' ':' (simple_stmt | suite)]
 | |
|                         ['else' ':' (simple_stmt | suite)]
 | |
|                         ['finally' ':' (simple_stmt | suite)]) >
 | |
|     """
 | |
| 
 | |
|     def transform(self, node, results):
 | |
|         syms = self.syms
 | |
| 
 | |
|         tail = [n.clone() for n in results["tail"]]
 | |
| 
 | |
|         try_cleanup = [ch.clone() for ch in results["cleanup"]]
 | |
|         for except_clause, e_suite in find_excepts(try_cleanup):
 | |
|             if len(except_clause.children) == 4:
 | |
|                 (E, comma, N) = except_clause.children[1:4]
 | |
|                 comma.replace(Name(u"as", prefix=u" "))
 | |
| 
 | |
|                 if N.type != token.NAME:
 | |
|                     # Generate a new N for the except clause
 | |
|                     new_N = Name(self.new_name(), prefix=u" ")
 | |
|                     target = N.clone()
 | |
|                     target.prefix = u""
 | |
|                     N.replace(new_N)
 | |
|                     new_N = new_N.clone()
 | |
| 
 | |
|                     # Insert "old_N = new_N" as the first statement in
 | |
|                     #  the except body. This loop skips leading whitespace
 | |
|                     #  and indents
 | |
|                     #TODO(cwinter) suite-cleanup
 | |
|                     suite_stmts = e_suite.children
 | |
|                     for i, stmt in enumerate(suite_stmts):
 | |
|                         if isinstance(stmt, pytree.Node):
 | |
|                             break
 | |
| 
 | |
|                     # The assignment is different if old_N is a tuple or list
 | |
|                     # In that case, the assignment is old_N = new_N.args
 | |
|                     if is_tuple(N) or is_list(N):
 | |
|                         assign = Assign(target, Attr(new_N, Name(u'args')))
 | |
|                     else:
 | |
|                         assign = Assign(target, new_N)
 | |
| 
 | |
|                     #TODO(cwinter) stopgap until children becomes a smart list
 | |
|                     for child in reversed(suite_stmts[:i]):
 | |
|                         e_suite.insert_child(0, child)
 | |
|                     e_suite.insert_child(i, assign)
 | |
|                 elif N.prefix == u"":
 | |
|                     # No space after a comma is legal; no space after "as",
 | |
|                     # not so much.
 | |
|                     N.prefix = u" "
 | |
| 
 | |
|         #TODO(cwinter) fix this when children becomes a smart list
 | |
|         children = [c.clone() for c in node.children[:3]] + try_cleanup + tail
 | |
|         return pytree.Node(node.type, children)
 |