[Python-checkins] r54477 - sandbox/trunk/2to3/fixes/fix_except.py sandbox/trunk/2to3/fixes/fix_has_key.py sandbox/trunk/2to3/fixes/fix_next.py sandbox/trunk/2to3/fixes/fix_nonzero.py sandbox/trunk/2to3/fixes/util.py

Wed Mar 21 04:15:30 CET 2007

Author: collin.winter
Date: Wed Mar 21 04:15:30 2007
New Revision: 54477
Modified:
 sandbox/trunk/2to3/fixes/fix_except.py
 sandbox/trunk/2to3/fixes/fix_has_key.py
 sandbox/trunk/2to3/fixes/fix_next.py
 sandbox/trunk/2to3/fixes/fix_nonzero.py
 sandbox/trunk/2to3/fixes/util.py
Log:
Add a prefix keyword arg to Name(); have the fixers take advantage of it.
Modified: sandbox/trunk/2to3/fixes/fix_except.py
==============================================================================

--- sandbox/trunk/2to3/fixes/fix_except.py	(original)
+++ sandbox/trunk/2to3/fixes/fix_except.py	Wed Mar 21 04:15:30 2007
@@ -60,8 +60,7 @@
 comma.replace(as_leaf.clone())
 if N.type != token.NAME:
 # Generate a new N for the except clause
- new_N = Name(self.new_name())
- new_N.set_prefix(" ")
+ new_N = Name(self.new_name(), prefix=" ")
 target = N.clone()
 target.set_prefix("")
 N.replace(new_N)
Modified: sandbox/trunk/2to3/fixes/fix_has_key.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_has_key.py	(original)
+++ sandbox/trunk/2to3/fixes/fix_has_key.py	Wed Mar 21 04:15:30 2007
@@ -93,11 +93,9 @@
 else:
 before = pytree.Node(syms.power, before)
 before.set_prefix(" ")
- n_op = Name("in")
- n_op.set_prefix(" ")
+ n_op = Name("in", prefix=" ")
 if negation:
- n_not = Name("not")
- n_not.set_prefix(" ")
+ n_not = Name("not", prefix=" ")
 n_op = pytree.Node(syms.comp_op, (n_not, n_op))
 new = pytree.Node(syms.comparison, (arg, n_op, before))
 if after:
Modified: sandbox/trunk/2to3/fixes/fix_next.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_next.py	(original)
+++ sandbox/trunk/2to3/fixes/fix_next.py	Wed Mar 21 04:15:30 2007
@@ -66,8 +66,7 @@
 node.replace(n)
 self.delayed.append(n)
 elif name:
- n = Name("__next__")
- n.set_prefix(name.get_prefix())
+ n = Name("__next__", prefix=name.get_prefix())
 name.replace(n)
 elif attr:
 # We don't do this transformation if we're assignment to "x.next".
Modified: sandbox/trunk/2to3/fixes/fix_nonzero.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_nonzero.py	(original)
+++ sandbox/trunk/2to3/fixes/fix_nonzero.py	Wed Mar 21 04:15:30 2007
@@ -4,9 +4,8 @@
 # Local imports
 import pytree
 from pgen2 import token
-from pygram import python_symbols as syms
 from fixes import basefix
-from fixes.util import Name
+from fixes.util import Name, syms
 
 class FixNonzero(basefix.BaseFix):
 PATTERN = """
@@ -22,6 +21,5 @@
 assert results
 
 name = results["name"]
- new = Name("__bool__")
- new.set_prefix(name.get_prefix())
+ new = Name("__bool__", prefix=name.get_prefix())
 name.replace(new)
Modified: sandbox/trunk/2to3/fixes/util.py
==============================================================================
--- sandbox/trunk/2to3/fixes/util.py	(original)
+++ sandbox/trunk/2to3/fixes/util.py	Wed Mar 21 04:15:30 2007
@@ -25,9 +25,11 @@
 
 return Node(syms.atom, target + (ass_leaf.clone(),) + source)
 
-def Name(name):
+def Name(name, prefix=""):
 """Return a NAME leaf"""
- return Leaf(token.NAME, name)
+ l = Leaf(token.NAME, name)
+ l.set_prefix(prefix)
+ return l
 
 def Attr(obj, attr):
 """A node tuple for obj.attr"""
