2008-03-19 01:43:46 -03:00
|
|
|
"""Fixer for except statements with named exceptions.
|
|
|
|
|
|
|
|
The following cases will be converted:
|
|
|
|
|
|
|
|
- "except E, T:" where T is a name:
|
2008-03-19 02:22:42 -03:00
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
except E as T:
|
2008-03-19 02:22:42 -03:00
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
- "except E, T:" where T is not a name, tuple or list:
|
2008-03-19 02:22:42 -03:00
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
except E as t:
|
|
|
|
T = t
|
2008-03-19 02:22:42 -03:00
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
This is done because the target of an "except" clause must be a
|
|
|
|
name.
|
2008-03-19 02:22:42 -03:00
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
- "except E, T:" where T is a tuple or list literal:
|
2008-03-19 02:22:42 -03:00
|
|
|
|
2008-03-19 01:43:46 -03:00
|
|
|
except E as t:
|
|
|
|
T = t.args
|
|
|
|
"""
|
|
|
|
# Author: Collin Winter
|
|
|
|
|
|
|
|
# Local imports
|
|
|
|
from .. import pytree
|
|
|
|
from ..pgen2 import token
|
Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines
Add import fixes for dbm package.
........
r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines
Add xmlrpc package fixes.
........
r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines
Add fixer entries for http package.
........
r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines
add import mapping for test.test_support -> test.support
........
r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines
mapping for commands module -> subprocess
........
r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line
Fixer for UserString.UserString over to the collections module.
........
r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines
Add a fixer for UserList.
Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch.
........
r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines
Move lib2to3/fixes/{basefix,util}.py down to lib2to3/.
This is step 1 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects.
........
r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines
Allow refactoring tools to specify a directory for fixer modules.
This is step 2 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects. Step 1: r63880.
........
2008-06-14 23:31:05 -03:00
|
|
|
from .. import fixer_base
|
Merged revisions 67384,67386-67387,67389-67390,67392,67399-67400,67403-67405,67426 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67384 | benjamin.peterson | 2008-11-25 16:13:31 -0600 (Tue, 25 Nov 2008) | 4 lines
don't duplicate calls to start_tree()
RefactoringTool.pre_order values now holds a list of the fixers while pre_order_mapping holds the dict.
........
r67386 | benjamin.peterson | 2008-11-25 16:44:52 -0600 (Tue, 25 Nov 2008) | 1 line
#4423 fix_imports was still replacing usage of a module if attributes were being used
........
r67387 | benjamin.peterson | 2008-11-25 16:47:54 -0600 (Tue, 25 Nov 2008) | 1 line
fix broken test
........
r67389 | benjamin.peterson | 2008-11-25 17:13:17 -0600 (Tue, 25 Nov 2008) | 1 line
remove compatibility code; we only cater to 2.5+
........
r67390 | benjamin.peterson | 2008-11-25 22:03:36 -0600 (Tue, 25 Nov 2008) | 1 line
fix #3994; the usage of changed imports was fixed in nested cases
........
r67392 | benjamin.peterson | 2008-11-26 11:11:40 -0600 (Wed, 26 Nov 2008) | 1 line
simpilfy and comment fix_imports
........
r67399 | benjamin.peterson | 2008-11-26 11:47:03 -0600 (Wed, 26 Nov 2008) | 1 line
remove more compatibility code
........
r67400 | benjamin.peterson | 2008-11-26 12:07:41 -0600 (Wed, 26 Nov 2008) | 1 line
set svn:ignore
........
r67403 | benjamin.peterson | 2008-11-26 13:11:11 -0600 (Wed, 26 Nov 2008) | 1 line
wrap import
........
r67404 | benjamin.peterson | 2008-11-26 13:29:49 -0600 (Wed, 26 Nov 2008) | 1 line
build the fix_imports pattern in compile_pattern, so MAPPING can be changed and reflected in the pattern
........
r67405 | benjamin.peterson | 2008-11-26 14:01:24 -0600 (Wed, 26 Nov 2008) | 1 line
stop ugly messages about runtime errors being from printed
........
r67426 | benjamin.peterson | 2008-11-28 16:01:40 -0600 (Fri, 28 Nov 2008) | 5 lines
don't replace a module name if it is in the middle of a attribute lookup
This fix also stops module names from being replaced if they are not in an attribute lookup.
........
2008-11-28 18:12:14 -04:00
|
|
|
from ..fixer_util import Assign, Attr, Name, is_tuple, is_list
|
2008-03-19 01:43:46 -03:00
|
|
|
|
|
|
|
def find_excepts(nodes):
|
|
|
|
for i, n in enumerate(nodes):
|
|
|
|
if isinstance(n, pytree.Node):
|
|
|
|
if n.children[0].value == 'except':
|
|
|
|
yield (n, nodes[i+2])
|
|
|
|
|
Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines
Add import fixes for dbm package.
........
r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines
Add xmlrpc package fixes.
........
r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines
Add fixer entries for http package.
........
r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines
add import mapping for test.test_support -> test.support
........
r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines
mapping for commands module -> subprocess
........
r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line
Fixer for UserString.UserString over to the collections module.
........
r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines
Add a fixer for UserList.
Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch.
........
r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines
Move lib2to3/fixes/{basefix,util}.py down to lib2to3/.
This is step 1 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects.
........
r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines
Allow refactoring tools to specify a directory for fixer modules.
This is step 2 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects. Step 1: r63880.
........
2008-06-14 23:31:05 -03:00
|
|
|
class FixExcept(fixer_base.BaseFix):
|
2008-03-19 01:43:46 -03:00
|
|
|
|
|
|
|
PATTERN = """
|
|
|
|
try_stmt< 'try' ':' suite
|
2008-03-28 02:27:44 -03:00
|
|
|
cleanup=(except_clause ':' suite)+
|
|
|
|
tail=(['except' ':' suite]
|
|
|
|
['else' ':' suite]
|
|
|
|
['finally' ':' suite]) >
|
2008-03-19 01:43:46 -03:00
|
|
|
"""
|
|
|
|
|
|
|
|
def transform(self, node, results):
|
|
|
|
syms = self.syms
|
|
|
|
|
2008-03-28 02:27:44 -03:00
|
|
|
tail = [n.clone() for n in results["tail"]]
|
|
|
|
|
|
|
|
try_cleanup = [ch.clone() for ch in results["cleanup"]]
|
2008-03-19 01:43:46 -03:00
|
|
|
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("as", prefix=" "))
|
|
|
|
|
|
|
|
if N.type != token.NAME:
|
|
|
|
# Generate a new N for the except clause
|
|
|
|
new_N = Name(self.new_name(), prefix=" ")
|
|
|
|
target = N.clone()
|
|
|
|
target.set_prefix("")
|
|
|
|
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('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.get_prefix() == "":
|
|
|
|
# No space after a comma is legal; no space after "as",
|
|
|
|
# not so much.
|
|
|
|
N.set_prefix(" ")
|
|
|
|
|
|
|
|
#TODO(cwinter) fix this when children becomes a smart list
|
2008-03-28 02:27:44 -03:00
|
|
|
children = [c.clone() for c in node.children[:3]] + try_cleanup + tail
|
2008-03-19 01:43:46 -03:00
|
|
|
return pytree.Node(node.type, children)
|