mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 05:31:20 +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
  ........
................
		
	
			
		
			
				
	
	
		
			82 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			82 lines
		
	
	
	
		
			2.5 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| """Fixer for 'raise E, V, T'
 | |
| 
 | |
| raise         -> raise
 | |
| raise E       -> raise E
 | |
| raise E, V    -> raise E(V)
 | |
| raise E, V, T -> raise E(V).with_traceback(T)
 | |
| 
 | |
| raise (((E, E'), E''), E'''), V -> raise E(V)
 | |
| raise "foo", V, T               -> warns about string exceptions
 | |
| 
 | |
| 
 | |
| CAVEATS:
 | |
| 1) "raise E, V" will be incorrectly translated if V is an exception
 | |
|    instance. The correct Python 3 idiom is
 | |
| 
 | |
|         raise E from V
 | |
| 
 | |
|    but since we can't detect instance-hood by syntax alone and since
 | |
|    any client code would have to be changed as well, we don't automate
 | |
|    this.
 | |
| """
 | |
| # Author: Collin Winter
 | |
| 
 | |
| # Local imports
 | |
| from .. import pytree
 | |
| from ..pgen2 import token
 | |
| from .. import fixer_base
 | |
| from ..fixer_util import Name, Call, Attr, ArgList, is_tuple
 | |
| 
 | |
| class FixRaise(fixer_base.BaseFix):
 | |
| 
 | |
|     PATTERN = """
 | |
|     raise_stmt< 'raise' exc=any [',' val=any [',' tb=any]] >
 | |
|     """
 | |
| 
 | |
|     def transform(self, node, results):
 | |
|         syms = self.syms
 | |
| 
 | |
|         exc = results["exc"].clone()
 | |
|         if exc.type is token.STRING:
 | |
|             self.cannot_convert(node, "Python 3 does not support string exceptions")
 | |
|             return
 | |
| 
 | |
|         # Python 2 supports
 | |
|         #  raise ((((E1, E2), E3), E4), E5), V
 | |
|         # as a synonym for
 | |
|         #  raise E1, V
 | |
|         # Since Python 3 will not support this, we recurse down any tuple
 | |
|         # literals, always taking the first element.
 | |
|         if is_tuple(exc):
 | |
|             while is_tuple(exc):
 | |
|                 # exc.children[1:-1] is the unparenthesized tuple
 | |
|                 # exc.children[1].children[0] is the first element of the tuple
 | |
|                 exc = exc.children[1].children[0].clone()
 | |
|             exc.prefix = " "
 | |
| 
 | |
|         if "val" not in results:
 | |
|             # One-argument raise
 | |
|             new = pytree.Node(syms.raise_stmt, [Name("raise"), exc])
 | |
|             new.prefix = node.prefix
 | |
|             return new
 | |
| 
 | |
|         val = results["val"].clone()
 | |
|         if is_tuple(val):
 | |
|             args = [c.clone() for c in val.children[1:-1]]
 | |
|         else:
 | |
|             val.prefix = ""
 | |
|             args = [val]
 | |
| 
 | |
|         if "tb" in results:
 | |
|             tb = results["tb"].clone()
 | |
|             tb.prefix = ""
 | |
| 
 | |
|             e = Call(exc, args)
 | |
|             with_tb = Attr(e, Name('with_traceback')) + [ArgList([tb])]
 | |
|             new = pytree.Node(syms.simple_stmt, [Name("raise")] + with_tb)
 | |
|             new.prefix = node.prefix
 | |
|             return new
 | |
|         else:
 | |
|             return pytree.Node(syms.raise_stmt,
 | |
|                                [Name("raise"), Call(exc, args)],
 | |
|                                prefix=node.prefix)
 |