Author: Brian Kearns <bdkea...@gmail.com>
Branch: stdlib-2.7.9
Changeset: r75008:b5dea7545f7c
Date: 2014-12-17 21:00 -0500
http://bitbucket.org/pypy/pypy/changeset/b5dea7545f7c/
Log: merge heads
diff --git a/lib-python/2.7/test/_mock_backport.py
b/lib-python/2.7/test/_mock_backport.py
--- a/lib-python/2.7/test/_mock_backport.py
+++ b/lib-python/2.7/test/_mock_backport.py
@@ -23,7 +23,7 @@
__version__ = '1.0'
-
+import __builtin__
import inspect
import pprint
import sys
@@ -32,7 +32,7 @@
from functools import wraps, partial
-_builtins = {name for name in __builtins__ if not name.startswith('_')}
+_builtins = {name for name in dir(__builtin__) if not name.startswith('_')}
BaseExceptions = (BaseException,)
if 'java' in sys.platform:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
