Author: Amaury Forgeot d'Arc <[email protected]>
Branch:
Changeset: r72879:0e073fccc124
Date: 2014-08-18 00:55 +0200
http://bitbucket.org/pypy/pypy/changeset/0e073fccc124/
Log: Fix merge
diff --git a/pypy/interpreter/astcompiler/ast.py
b/pypy/interpreter/astcompiler/ast.py
--- a/pypy/interpreter/astcompiler/ast.py
+++ b/pypy/interpreter/astcompiler/ast.py
@@ -10,7 +10,7 @@
def raise_attriberr(space, w_obj, name):
raise oefmt(space.w_AttributeError,
- \"'%T' object has no attribute '%s'\", w_obj, name)
+ "'%T' object has no attribute '%s'", w_obj, name)
def check_string(space, w_obj):
diff --git a/pypy/interpreter/astcompiler/tools/asdl_py.py
b/pypy/interpreter/astcompiler/tools/asdl_py.py
--- a/pypy/interpreter/astcompiler/tools/asdl_py.py
+++ b/pypy/interpreter/astcompiler/tools/asdl_py.py
@@ -393,7 +393,7 @@
def raise_attriberr(space, w_obj, name):
raise oefmt(space.w_AttributeError,
- \"'%T' object has no attribute '%s'\", w_obj, name)
+ "'%T' object has no attribute '%s'", w_obj, name)
def check_string(space, w_obj):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
