# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1339453229 -7200
# Node ID 39f7dc0698c4ade0735c339483087f636b274d30
# Parent  f9fb60400d7c9aae25fedaa148babb1d5e37b2be
Changed __repr__ format strings to use %r directly with objects.

diff -r f9fb60400d7c -r 39f7dc0698c4 compiler/ast.py
--- a/compiler/ast.py	Tue Jun 12 00:16:42 2012 +0200
+++ b/compiler/ast.py	Tue Jun 12 00:20:29 2012 +0200
@@ -50,7 +50,7 @@
         return self.node,
 
     def __repr__(self):
-        return "Expression(%s)" % (repr(self.node))
+        return "Expression(%r)" % (self.node,)
 
     def visit(self, visitor, *args):
         return visitor.visitExpression(self, *args)
@@ -68,7 +68,7 @@
         return self.left, self.right
 
     def __repr__(self):
-        return "Add((%s, %s))" % (repr(self.left), repr(self.right))
+        return "Add((%r, %r))" % (self.left, self.right)
 
     def visit(self, visitor, *args):
         return visitor.visitAdd(self, *args)
@@ -87,7 +87,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "And(%s)" % (repr(self.nodes),)
+        return "And(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitAnd(self, *args)
@@ -106,7 +106,7 @@
         return self.expr,
 
     def __repr__(self):
-        return "AssAttr(%s, %s, %s)" % (repr(self.expr), repr(self.attrname), repr(self.flags))
+        return "AssAttr(%r, %r, %r)" % (self.expr, self.attrname, self.flags)
 
     def visit(self, visitor, *args):
         return visitor.visitAssAttr(self, *args)
@@ -125,7 +125,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "AssList(%s)" % (repr(self.nodes),)
+        return "AssList(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitAssList(self, *args)
@@ -143,7 +143,7 @@
         return ()
 
     def __repr__(self):
-        return "AssName(%s, %s)" % (repr(self.name), repr(self.flags))
+        return "AssName(%r, %r)" % (self.name, self.flags)
 
     def visit(self, visitor, *args):
         return visitor.visitAssName(self, *args)
@@ -162,7 +162,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "AssTuple(%s)" % (repr(self.nodes),)
+        return "AssTuple(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitAssTuple(self, *args)
@@ -187,7 +187,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Assert(%s, %s)" % (repr(self.test), repr(self.fail))
+        return "Assert(%r, %r)" % (self.test, self.fail)
 
     def visit(self, visitor, *args):
         return visitor.visitAssert(self, *args)
@@ -211,7 +211,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Assign(%s, %s)" % (repr(self.nodes), repr(self.expr))
+        return "Assign(%r, %r)" % (self.nodes, self.expr)
 
     def visit(self, visitor, *args):
         return visitor.visitAssign(self, *args)
@@ -230,7 +230,7 @@
         return self.node, self.expr
 
     def __repr__(self):
-        return "AugAssign(%s, %s, %s)" % (repr(self.node), repr(self.op), repr(self.expr))
+        return "AugAssign(%r, %r, %r)" % (self.node, self.op, self.expr)
 
     def visit(self, visitor, *args):
         return visitor.visitAugAssign(self, *args)
@@ -247,7 +247,7 @@
         return self.expr,
 
     def __repr__(self):
-        return "Backquote(%s)" % (repr(self.expr),)
+        return "Backquote(%r)" % (self.expr,)
 
     def visit(self, visitor, *args):
         return visitor.visitBackquote(self, *args)
@@ -266,7 +266,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Bitand(%s)" % (repr(self.nodes),)
+        return "Bitand(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitBitand(self, *args)
@@ -285,7 +285,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Bitor(%s)" % (repr(self.nodes),)
+        return "Bitor(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitBitor(self, *args)
@@ -304,7 +304,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Bitxor(%s)" % (repr(self.nodes),)
+        return "Bitxor(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitBitxor(self, *args)
@@ -352,7 +352,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "CallFunc(%s, %s, %s, %s)" % (repr(self.node), repr(self.args), repr(self.star_args), repr(self.dstar_args))
+        return "CallFunc(%r, %r, %r, %r)" % (self.node, self.args, self.star_args, self.dstar_args)
 
     def visit(self, visitor, *args):
         return visitor.visitCallFunc(self, *args)
@@ -380,7 +380,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Class(%s, %s, %s, %s)" % (repr(self.name), repr(self.bases), repr(self.doc), repr(self.code))
+        return "Class(%r, %r, %r, %r)" % (self.name, self.bases, self.doc, self.code)
 
     def visit(self, visitor, *args):
         return visitor.visitClass(self, *args)
@@ -404,7 +404,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Compare(%s, %s)" % (repr(self.expr), repr(self.ops))
+        return "Compare(%r, %r)" % (self.expr, self.ops)
 
     def visit(self, visitor, *args):
         return visitor.visitCompare(self, *args)
@@ -421,7 +421,7 @@
         return ()
 
     def __repr__(self):
-        return "Const(%s)" % (repr(self.value),)
+        return "Const(%r)" % (self.value,)
 
     def visit(self, visitor, *args):
         return visitor.visitConst(self, *args)
@@ -456,7 +456,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Decorators(%s)" % (repr(self.nodes),)
+        return "Decorators(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitDecorators(self, *args)
@@ -475,7 +475,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Dict(%s)" % (repr(self.items),)
+        return "Dict(%r)" % (self.items,)
 
     def visit(self, visitor, *args):
         return visitor.visitDict(self, *args)
@@ -492,7 +492,7 @@
         return self.expr,
 
     def __repr__(self):
-        return "Discard(%s)" % (repr(self.expr),)
+        return "Discard(%r)" % (self.expr,)
 
     def visit(self, visitor, *args):
         return visitor.visitDiscard(self, *args)
@@ -510,7 +510,7 @@
         return self.left, self.right
 
     def __repr__(self):
-        return "Div((%s, %s))" % (repr(self.left), repr(self.right))
+        return "Div((%r, %r))" % (self.left, self.right)
 
     def visit(self, visitor, *args):
         return visitor.visitDiv(self, *args)
@@ -555,7 +555,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Exec(%s, %s, %s)" % (repr(self.expr), repr(self.locals), repr(self.globals))
+        return "Exec(%r, %r, %r)" % (self.expr, self.locals, self.globals)
 
     def visit(self, visitor, *args):
         return visitor.visitExec(self, *args)
@@ -573,7 +573,7 @@
         return self.left, self.right
 
     def __repr__(self):
-        return "FloorDiv((%s, %s))" % (repr(self.left), repr(self.right))
+        return "FloorDiv((%r, %r))" % (self.left, self.right)
 
     def visit(self, visitor, *args):
         return visitor.visitFloorDiv(self, *args)
@@ -604,7 +604,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "For(%s, %s, %s, %s)" % (repr(self.assign), repr(self.list), repr(self.body), repr(self.else_))
+        return "For(%r, %r, %r, %r)" % (self.assign, self.list, self.body, self.else_)
 
     def visit(self, visitor, *args):
         return visitor.visitFor(self, *args)
@@ -623,7 +623,7 @@
         return ()
 
     def __repr__(self):
-        return "From(%s, %s, %s)" % (repr(self.modname), repr(self.names), repr(self.level))
+        return "From(%r, %r, %r)" % (self.modname, self.names, self.level)
 
     def visit(self, visitor, *args):
         return visitor.visitFrom(self, *args)
@@ -666,7 +666,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Function(%s, %s, %s, %s, %s, %s, %s)" % (repr(self.decorators), repr(self.name), repr(self.argnames), repr(self.defaults), repr(self.flags), repr(self.doc), repr(self.code))
+        return "Function(%r, %r, %r, %r, %r, %r, %r)" % (self.decorators, self.name, self.argnames, self.defaults, self.flags, self.doc, self.code)
 
     def visit(self, visitor, *args):
         return visitor.visitFunction(self, *args)
@@ -685,7 +685,7 @@
         return self.code,
 
     def __repr__(self):
-        return "GenExpr(%s)" % (repr(self.code),)
+        return "GenExpr(%r)" % (self.code,)
 
     def visit(self, visitor, *args):
         return visitor.visitGenExpr(self, *args)
@@ -714,7 +714,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "GenExprFor(%s, %s, %s)" % (repr(self.assign), repr(self.iter), repr(self.ifs))
+        return "GenExprFor(%r, %r, %r)" % (self.assign, self.iter, self.ifs)
 
     def visit(self, visitor, *args):
         return visitor.visitGenExprFor(self, *args)
@@ -731,7 +731,7 @@
         return self.test,
 
     def __repr__(self):
-        return "GenExprIf(%s)" % (repr(self.test),)
+        return "GenExprIf(%r)" % (self.test,)
 
     def visit(self, visitor, *args):
         return visitor.visitGenExprIf(self, *args)
@@ -755,7 +755,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "GenExprInner(%s, %s)" % (repr(self.expr), repr(self.quals))
+        return "GenExprInner(%r, %r)" % (self.expr, self.quals)
 
     def visit(self, visitor, *args):
         return visitor.visitGenExprInner(self, *args)
@@ -773,7 +773,7 @@
         return self.expr,
 
     def __repr__(self):
-        return "Getattr(%s, %s)" % (repr(self.expr), repr(self.attrname))
+        return "Getattr(%r, %r)" % (self.expr, self.attrname)
 
     def visit(self, visitor, *args):
         return visitor.visitGetattr(self, *args)
@@ -790,7 +790,7 @@
         return ()
 
     def __repr__(self):
-        return "Global(%s)" % (repr(self.names),)
+        return "Global(%r)" % (self.names,)
 
     def visit(self, visitor, *args):
         return visitor.visitGlobal(self, *args)
@@ -815,7 +815,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "If(%s, %s)" % (repr(self.tests), repr(self.else_))
+        return "If(%r, %r)" % (self.tests, self.else_)
 
     def visit(self, visitor, *args):
         return visitor.visitIf(self, *args)
@@ -834,7 +834,7 @@
         return self.test, self.then, self.else_
 
     def __repr__(self):
-        return "IfExp(%s, %s, %s)" % (repr(self.test), repr(self.then), repr(self.else_))
+        return "IfExp(%r, %r, %r)" % (self.test, self.then, self.else_)
 
     def visit(self, visitor, *args):
         return visitor.visitIfExp(self, *args)
@@ -851,7 +851,7 @@
         return ()
 
     def __repr__(self):
-        return "Import(%s)" % (repr(self.names),)
+        return "Import(%r)" % (self.names,)
 
     def visit(self, visitor, *args):
         return visitor.visitImport(self, *args)
@@ -868,7 +868,7 @@
         return self.expr,
 
     def __repr__(self):
-        return "Invert(%s)" % (repr(self.expr),)
+        return "Invert(%r)" % (self.expr,)
 
     def visit(self, visitor, *args):
         return visitor.visitInvert(self, *args)
@@ -886,7 +886,7 @@
         return self.expr,
 
     def __repr__(self):
-        return "Keyword(%s, %s)" % (repr(self.name), repr(self.expr))
+        return "Keyword(%r, %r)" % (self.name, self.expr)
 
     def visit(self, visitor, *args):
         return visitor.visitKeyword(self, *args)
@@ -921,7 +921,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Lambda(%s, %s, %s, %s)" % (repr(self.argnames), repr(self.defaults), repr(self.flags), repr(self.code))
+        return "Lambda(%r, %r, %r, %r)" % (self.argnames, self.defaults, self.flags, self.code)
 
     def visit(self, visitor, *args):
         return visitor.visitLambda(self, *args)
@@ -939,7 +939,7 @@
         return self.left, self.right
 
     def __repr__(self):
-        return "LeftShift((%s, %s))" % (repr(self.left), repr(self.right))
+        return "LeftShift((%r, %r))" % (self.left, self.right)
 
     def visit(self, visitor, *args):
         return visitor.visitLeftShift(self, *args)
@@ -958,7 +958,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "List(%s)" % (repr(self.nodes),)
+        return "List(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitList(self, *args)
@@ -982,7 +982,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "ListComp(%s, %s)" % (repr(self.expr), repr(self.quals))
+        return "ListComp(%r, %r)" % (self.expr, self.quals)
 
     def visit(self, visitor, *args):
         return visitor.visitListComp(self, *args)
@@ -1009,7 +1009,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "ListCompFor(%s, %s, %s)" % (repr(self.assign), repr(self.list), repr(self.ifs))
+        return "ListCompFor(%r, %r, %r)" % (self.assign, self.list, self.ifs)
 
     def visit(self, visitor, *args):
         return visitor.visitListCompFor(self, *args)
@@ -1026,7 +1026,7 @@
         return self.test,
 
     def __repr__(self):
-        return "ListCompIf(%s)" % (repr(self.test),)
+        return "ListCompIf(%r)" % (self.test,)
 
     def visit(self, visitor, *args):
         return visitor.visitListCompIf(self, *args)
@@ -1044,7 +1044,7 @@
         return self.left, self.right
 
     def __repr__(self):
-        return "Mod((%s, %s))" % (repr(self.left), repr(self.right))
+        return "Mod((%r, %r))" % (self.left, self.right)
 
     def visit(self, visitor, *args):
         return visitor.visitMod(self, *args)
@@ -1062,7 +1062,7 @@
         return self.node,
 
     def __repr__(self):
-        return "Module(%s, %s)" % (repr(self.doc), repr(self.node))
+        return "Module(%r, %r)" % (self.doc, self.node)
 
     def visit(self, visitor, *args):
         return visitor.visitModule(self, *args)
@@ -1080,7 +1080,7 @@
         return self.left, self.right
 
     def __repr__(self):
-        return "Mul((%s, %s))" % (repr(self.left), repr(self.right))
+        return "Mul((%r, %r))" % (self.left, self.right)
 
     def visit(self, visitor, *args):
         return visitor.visitMul(self, *args)
@@ -1097,7 +1097,7 @@
         return ()
 
     def __repr__(self):
-        return "Name(%s)" % (repr(self.name),)
+        return "Name(%r)" % (self.name,)
 
     def visit(self, visitor, *args):
         return visitor.visitName(self, *args)
@@ -1114,7 +1114,7 @@
         return self.expr,
 
     def __repr__(self):
-        return "Not(%s)" % (repr(self.expr),)
+        return "Not(%r)" % (self.expr,)
 
     def visit(self, visitor, *args):
         return visitor.visitNot(self, *args)
@@ -1133,7 +1133,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Or(%s)" % (repr(self.nodes),)
+        return "Or(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitOr(self, *args)
@@ -1167,7 +1167,7 @@
         return self.left, self.right
 
     def __repr__(self):
-        return "Power((%s, %s))" % (repr(self.left), repr(self.right))
+        return "Power((%r, %r))" % (self.left, self.right)
 
     def visit(self, visitor, *args):
         return visitor.visitPower(self, *args)
@@ -1192,7 +1192,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Print(%s, %s)" % (repr(self.nodes), repr(self.dest))
+        return "Print(%r, %r)" % (self.nodes, self.dest)
 
     def visit(self, visitor, *args):
         return visitor.visitPrint(self, *args)
@@ -1217,7 +1217,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Printnl(%s, %s)" % (repr(self.nodes), repr(self.dest))
+        return "Printnl(%r, %r)" % (self.nodes, self.dest)
 
     def visit(self, visitor, *args):
         return visitor.visitPrintnl(self, *args)
@@ -1247,7 +1247,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Raise(%s, %s, %s)" % (repr(self.expr1), repr(self.expr2), repr(self.expr3))
+        return "Raise(%r, %r, %r)" % (self.expr1, self.expr2, self.expr3)
 
     def visit(self, visitor, *args):
         return visitor.visitRaise(self, *args)
@@ -1264,7 +1264,7 @@
         return self.value,
 
     def __repr__(self):
-        return "Return(%s)" % (repr(self.value),)
+        return "Return(%r)" % (self.value,)
 
     def visit(self, visitor, *args):
         return visitor.visitReturn(self, *args)
@@ -1282,7 +1282,7 @@
         return self.left, self.right
 
     def __repr__(self):
-        return "RightShift((%s, %s))" % (repr(self.left), repr(self.right))
+        return "RightShift((%r, %r))" % (self.left, self.right)
 
     def visit(self, visitor, *args):
         return visitor.visitRightShift(self, *args)
@@ -1313,7 +1313,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Slice(%s, %s, %s, %s)" % (repr(self.expr), repr(self.flags), repr(self.lower), repr(self.upper))
+        return "Slice(%r, %r, %r, %r)" % (self.expr, self.flags, self.lower, self.upper)
 
     def visit(self, visitor, *args):
         return visitor.visitSlice(self, *args)
@@ -1332,7 +1332,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Sliceobj(%s)" % (repr(self.nodes),)
+        return "Sliceobj(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitSliceobj(self, *args)
@@ -1351,7 +1351,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Stmt(%s)" % (repr(self.nodes),)
+        return "Stmt(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitStmt(self, *args)
@@ -1369,7 +1369,7 @@
         return self.left, self.right
 
     def __repr__(self):
-        return "Sub((%s, %s))" % (repr(self.left), repr(self.right))
+        return "Sub((%r, %r))" % (self.left, self.right)
 
     def visit(self, visitor, *args):
         return visitor.visitSub(self, *args)
@@ -1395,7 +1395,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Subscript(%s, %s, %s)" % (repr(self.expr), repr(self.flags), repr(self.subs))
+        return "Subscript(%r, %r, %r)" % (self.expr, self.flags, self.subs)
 
     def visit(self, visitor, *args):
         return visitor.visitSubscript(self, *args)
@@ -1423,7 +1423,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "TryExcept(%s, %s, %s)" % (repr(self.body), repr(self.handlers), repr(self.else_))
+        return "TryExcept(%r, %r, %r)" % (self.body, self.handlers, self.else_)
 
     def visit(self, visitor, *args):
         return visitor.visitTryExcept(self, *args)
@@ -1441,7 +1441,7 @@
         return self.body, self.final
 
     def __repr__(self):
-        return "TryFinally(%s, %s)" % (repr(self.body), repr(self.final))
+        return "TryFinally(%r, %r)" % (self.body, self.final)
 
     def visit(self, visitor, *args):
         return visitor.visitTryFinally(self, *args)
@@ -1460,7 +1460,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "Tuple(%s)" % (repr(self.nodes),)
+        return "Tuple(%r)" % (self.nodes,)
 
     def visit(self, visitor, *args):
         return visitor.visitTuple(self, *args)
@@ -1477,7 +1477,7 @@
         return self.expr,
 
     def __repr__(self):
-        return "UnaryAdd(%s)" % (repr(self.expr),)
+        return "UnaryAdd(%r)" % (self.expr,)
 
     def visit(self, visitor, *args):
         return visitor.visitUnaryAdd(self, *args)
@@ -1494,7 +1494,7 @@
         return self.expr,
 
     def __repr__(self):
-        return "UnarySub(%s)" % (repr(self.expr),)
+        return "UnarySub(%r)" % (self.expr,)
 
     def visit(self, visitor, *args):
         return visitor.visitUnarySub(self, *args)
@@ -1522,7 +1522,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "While(%s, %s, %s)" % (repr(self.test), repr(self.body), repr(self.else_))
+        return "While(%r, %r, %r)" % (self.test, self.body, self.else_)
 
     def visit(self, visitor, *args):
         return visitor.visitWhile(self, *args)
@@ -1550,7 +1550,7 @@
         return tuple(nodelist)
 
     def __repr__(self):
-        return "With(%s, %s, %s)" % (repr(self.expr), repr(self.vars), repr(self.body))
+        return "With(%r, %r, %r)" % (self.expr, self.vars, self.body)
 
     def visit(self, visitor, *args):
         return visitor.visitWith(self, *args)
@@ -1567,7 +1567,7 @@
         return self.value,
 
     def __repr__(self):
-        return "Yield(%s)" % (repr(self.value),)
+        return "Yield(%r)" % (self.value,)
 
     def visit(self, visitor, *args):
         return visitor.visitYield(self, *args)