[Python-checkins] r54471 - in sandbox/trunk/2to3: fixes/fix_apply.py fixes/fix_dict.py fixes/fix_except.py fixes/fix_exec.py fixes/fix_has_key.py fixes/fix_input.py fixes/fix_intern.py fixes/fix_long.py fixes/fix_next.py fixes/fix_nonzero.py fixes/fix_print.py fixes/fix_raise.py fixes/fix_raw_input.py fixes/fix_repr.py fixes/fix_throw.py fixes/fix_tuple_params.py fixes/fix_xrange.py fixes/macros.py fixes/util.py refactor.py
collin.winter
python-checkins at python.org
Wed Mar 21 03:21:46 CET 2007
Author: collin.winter
Date: Wed Mar 21 03:21:36 2007
New Revision: 54471
Added:
sandbox/trunk/2to3/fixes/util.py
- copied, changed from r54463, sandbox/trunk/2to3/fixes/macros.py
Removed:
sandbox/trunk/2to3/fixes/macros.py
Modified:
sandbox/trunk/2to3/fixes/fix_apply.py
sandbox/trunk/2to3/fixes/fix_dict.py
sandbox/trunk/2to3/fixes/fix_except.py
sandbox/trunk/2to3/fixes/fix_exec.py
sandbox/trunk/2to3/fixes/fix_has_key.py
sandbox/trunk/2to3/fixes/fix_input.py
sandbox/trunk/2to3/fixes/fix_intern.py
sandbox/trunk/2to3/fixes/fix_long.py
sandbox/trunk/2to3/fixes/fix_next.py
sandbox/trunk/2to3/fixes/fix_nonzero.py
sandbox/trunk/2to3/fixes/fix_print.py
sandbox/trunk/2to3/fixes/fix_raise.py
sandbox/trunk/2to3/fixes/fix_raw_input.py
sandbox/trunk/2to3/fixes/fix_repr.py
sandbox/trunk/2to3/fixes/fix_throw.py
sandbox/trunk/2to3/fixes/fix_tuple_params.py
sandbox/trunk/2to3/fixes/fix_xrange.py
sandbox/trunk/2to3/refactor.py
Log:
Rename fixes.macros to fixes.util. I want it to be more general than just node construction macros.
Modified: sandbox/trunk/2to3/fixes/fix_apply.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_apply.py (original)
+++ sandbox/trunk/2to3/fixes/fix_apply.py Wed Mar 21 03:21:36 2007
@@ -9,7 +9,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Call, Comma
+from fixes.util import Call, Comma
class FixApply(basefix.BaseFix):
Modified: sandbox/trunk/2to3/fixes/fix_dict.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_dict.py (original)
+++ sandbox/trunk/2to3/fixes/fix_dict.py Wed Mar 21 03:21:36 2007
@@ -26,7 +26,7 @@
import patcomp
from pgen2 import token
from fixes import basefix
-from fixes import macros
+from fixes.util import Name, Call, lparen_leaf, rparen_leaf
class FixDict(basefix.BaseFix):
@@ -54,14 +54,14 @@
special = not tail and self.in_special_context(node, isiter)
args = head + [pytree.Node(syms.trailer,
[pytree.Leaf(token.DOT, '.'),
- macros.Name(method)]),
+ Name(method)]),
pytree.Node(syms.trailer,
- [macros.lparen_leaf.clone(),
- macros.rparen_leaf.clone()])]
+ [lparen_leaf.clone(),
+ rparen_leaf.clone()])]
new = pytree.Node(syms.power, args)
if not special:
new.set_prefix("")
- new = macros.Call(macros.Name(isiter and "iter" or "list"), [new])
+ new = Call(Name(isiter and "iter" or "list"), [new])
if tail:
new = pytree.Node(syms.power, [new] + tail)
new.set_prefix(node.get_prefix())
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 03:21:36 2007
@@ -27,7 +27,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Assign, Attr, Name
+from fixes.util import Assign, Attr, Name
def find_excepts(nodes):
for i, n in enumerate(nodes):
Modified: sandbox/trunk/2to3/fixes/fix_exec.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_exec.py (original)
+++ sandbox/trunk/2to3/fixes/fix_exec.py Wed Mar 21 03:21:36 2007
@@ -13,7 +13,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Comma, Name, Call
+from fixes.util import Comma, Name, Call
class FixExec(basefix.BaseFix):
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 03:21:36 2007
@@ -33,7 +33,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Name
+from fixes.util import Name
class FixHasKey(basefix.BaseFix):
Modified: sandbox/trunk/2to3/fixes/fix_input.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_input.py (original)
+++ sandbox/trunk/2to3/fixes/fix_input.py Wed Mar 21 03:21:36 2007
@@ -6,7 +6,7 @@
import patcomp
from pgen2 import token
from fixes import basefix
-from fixes import macros
+from fixes.util import Call, Name
class FixInput(basefix.BaseFix):
@@ -20,6 +20,6 @@
def transform(self, node):
new = node.clone()
new.set_prefix("")
- new = macros.Call(macros.Name("eval"), [new])
+ new = Call(Name("eval"), [new])
new.set_prefix(node.get_prefix())
return new
Modified: sandbox/trunk/2to3/fixes/fix_intern.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_intern.py (original)
+++ sandbox/trunk/2to3/fixes/fix_intern.py Wed Mar 21 03:21:36 2007
@@ -9,7 +9,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Name, Attr
+from fixes.util import Name, Attr
class FixIntern(basefix.BaseFix):
Modified: sandbox/trunk/2to3/fixes/fix_long.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_long.py (original)
+++ sandbox/trunk/2to3/fixes/fix_long.py Wed Mar 21 03:21:36 2007
@@ -10,7 +10,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Name
+from fixes.util import Name
class FixLong(basefix.BaseFix):
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 03:21:36 2007
@@ -10,7 +10,7 @@
from pgen2 import token
from pygram import python_symbols as syms
from fixes import basefix
-from fixes.macros import Name, Call
+from fixes.util import Name, Call
bind_warning = "Calls to builtin next() possibly shadowed by global binding"
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 03:21:36 2007
@@ -6,7 +6,7 @@
from pgen2 import token
from pygram import python_symbols as syms
from fixes import basefix
-from fixes.macros import Name
+from fixes.util import Name
class FixNonzero(basefix.BaseFix):
PATTERN = """
Modified: sandbox/trunk/2to3/fixes/fix_print.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_print.py (original)
+++ sandbox/trunk/2to3/fixes/fix_print.py Wed Mar 21 03:21:36 2007
@@ -14,7 +14,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Name, Call, Comma
+from fixes.util import Name, Call, Comma
class FixPrint(basefix.BaseFix):
Modified: sandbox/trunk/2to3/fixes/fix_raise.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_raise.py (original)
+++ sandbox/trunk/2to3/fixes/fix_raise.py Wed Mar 21 03:21:36 2007
@@ -25,7 +25,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Name, Call, Attr, ArgList, is_tuple
+from fixes.util import Name, Call, Attr, ArgList, is_tuple
class FixRaise(basefix.BaseFix):
Modified: sandbox/trunk/2to3/fixes/fix_raw_input.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_raw_input.py (original)
+++ sandbox/trunk/2to3/fixes/fix_raw_input.py Wed Mar 21 03:21:36 2007
@@ -5,7 +5,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes import macros
+from fixes.util import Name
class FixRawInput(basefix.BaseFix):
@@ -20,6 +20,6 @@
results = self.match(node)
args = results["args"]
new = pytree.Node(self.syms.power,
- [macros.Name("input"), args.clone()])
+ [Name("input"), args.clone()])
new.set_prefix(node.get_prefix())
return new
Modified: sandbox/trunk/2to3/fixes/fix_repr.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_repr.py (original)
+++ sandbox/trunk/2to3/fixes/fix_repr.py Wed Mar 21 03:21:36 2007
@@ -7,7 +7,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Call, Name
+from fixes.util import Call, Name
class FixRepr(basefix.BaseFix):
Modified: sandbox/trunk/2to3/fixes/fix_throw.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_throw.py (original)
+++ sandbox/trunk/2to3/fixes/fix_throw.py Wed Mar 21 03:21:36 2007
@@ -11,7 +11,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes.macros import Name, Call, ArgList, Attr, is_tuple
+from fixes.util import Name, Call, ArgList, Attr, is_tuple
class FixThrow(basefix.BaseFix):
Modified: sandbox/trunk/2to3/fixes/fix_tuple_params.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_tuple_params.py (original)
+++ sandbox/trunk/2to3/fixes/fix_tuple_params.py Wed Mar 21 03:21:36 2007
@@ -20,7 +20,7 @@
from pgen2 import token
from pygram import python_symbols as syms
from fixes import basefix
-from fixes.macros import Assign, Name, Newline, Number, Subscript
+from fixes.util import Assign, Name, Newline, Number, Subscript
def is_docstring(stmt):
return isinstance(stmt, pytree.Node) and \
Modified: sandbox/trunk/2to3/fixes/fix_xrange.py
==============================================================================
--- sandbox/trunk/2to3/fixes/fix_xrange.py (original)
+++ sandbox/trunk/2to3/fixes/fix_xrange.py Wed Mar 21 03:21:36 2007
@@ -6,7 +6,7 @@
import pytree
from pgen2 import token
from fixes import basefix
-from fixes import macros
+from fixes.util import Name
class FixXrange(basefix.BaseFix):
@@ -21,6 +21,6 @@
results = self.match(node)
args = results["args"]
new = pytree.Node(self.syms.power,
- [macros.Name("range"), args.clone()])
+ [Name("range"), args.clone()])
new.set_prefix(node.get_prefix())
return new
Deleted: /sandbox/trunk/2to3/fixes/macros.py
==============================================================================
--- /sandbox/trunk/2to3/fixes/macros.py Wed Mar 21 03:21:36 2007
+++ (empty file)
@@ -1,74 +0,0 @@
-"""Abstract away often-used node construction routines."""
-# Author: Collin Winter
-
-# Local imports
-from pgen2 import token
-from pytree import Leaf, Node
-from pygram import python_symbols as syms
-
-
-### Constant nodes
-ass_leaf = Leaf(token.EQUAL, "=")
-ass_leaf.set_prefix(" ")
-
-comma_leaf = Leaf(token.COMMA, ",")
-lparen_leaf = Leaf(token.LPAR, "(")
-rparen_leaf = Leaf(token.RPAR, ")")
-
-def Assign(target, source):
- """Build an assignment statement"""
- if not isinstance(target, tuple):
- target = (target,)
- if not isinstance(source, tuple):
- source.set_prefix(" ")
- source = (source,)
-
- return Node(syms.atom, target + (ass_leaf.clone(),) + source)
-
-def Name(name):
- """Return a NAME leaf"""
- return Leaf(token.NAME, name)
-
-def Attr(obj, attr):
- """A node tuple for obj.attr"""
- return (obj,
- Node(syms.trailer, [Leaf(token.DOT, '.'),
- attr]))
-
-def Comma():
- """A comma leaf"""
- return comma_leaf.clone()
-
-def ArgList(args, lparen=lparen_leaf, rparen=rparen_leaf):
- """A parenthesised argument list, used by Call()"""
- return Node(syms.trailer,
- [lparen.clone(),
- Node(syms.arglist, args),
- rparen.clone()])
-
-def Call(func_name, args):
- """A function call"""
- return Node(syms.power, [func_name, ArgList(args)])
-
-def Newline():
- """A newline literal"""
- return Leaf(token.NEWLINE, "\n")
-
-def Number(n):
- return Leaf(token.NUMBER, n)
-
-def Subscript(index_node):
- """A numeric or string subscript"""
- return Node(syms.trailer, [Leaf(token.LBRACE, '['),
- index_node,
- Leaf(token.RBRACE, ']')])
-
-def is_tuple(node):
- """Does the node represent a tuple literal?"""
-
- return (isinstance(node, Node)
- and len(node.children) > 1
- and isinstance(node.children[0], Leaf)
- and isinstance(node.children[-1], Leaf)
- and node.children[0].value == "("
- and node.children[-1].value == ")")
Copied: sandbox/trunk/2to3/fixes/util.py (from r54463, sandbox/trunk/2to3/fixes/macros.py)
==============================================================================
--- sandbox/trunk/2to3/fixes/macros.py (original)
+++ sandbox/trunk/2to3/fixes/util.py Wed Mar 21 03:21:36 2007
@@ -1,4 +1,4 @@
-"""Abstract away often-used node construction routines."""
+"""Utility functions, node construction macros, etc."""
# Author: Collin Winter
# Local imports
Modified: sandbox/trunk/2to3/refactor.py
==============================================================================
--- sandbox/trunk/2to3/refactor.py (original)
+++ sandbox/trunk/2to3/refactor.py Wed Mar 21 03:21:36 2007
@@ -25,7 +25,6 @@
from pgen2 import driver
from pgen2 import tokenize
import fixes
-import fixes.macros
import pygram
if sys.version_info < (2, 4):
More information about the Python-checkins
mailing list