Commit c7e32a1e authored by Amaury Forgeot d'Arc's avatar Amaury Forgeot d'Arc

Fix merge

parent afb165d1
......@@ -10,7 +10,7 @@ from pypy.interpreter.gateway import interp2app
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):
......
......@@ -393,7 +393,7 @@ from pypy.interpreter.gateway import interp2app
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):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment