Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r59384:f76e849ed47e
Date: 2012-12-10 12:38 -0800
http://bitbucket.org/pypy/pypy/changeset/f76e849ed47e/
Log: merge default
diff --git a/pypy/tool/pytest/objspace.py b/pypy/tool/pytest/objspace.py
--- a/pypy/tool/pytest/objspace.py
+++ b/pypy/tool/pytest/objspace.py
@@ -68,8 +68,11 @@
py.test.skip("cannot runappdirect test: space needs %s = %s, "\
"while pypy-c was built with %s" % (key, value, has))
- for name in ('int', 'long', 'str', 'unicode', 'None'):
+ for name in ('int', 'long', 'str', 'unicode', 'None', 'ValueError',
+ 'OverflowError'):
setattr(self, 'w_' + name, eval(name))
+ import __builtin__ as __builtin__
+ self.builtin = __builtin__
def appexec(self, args, body):
body = body.lstrip()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
