sync to pytest 2.5.2 and pylib 1.4.20

1 files changed, 15 insertions, 4 deletions

diff --git a/py/_builtin.py b/py/_builtin.py
index 67971f0afc..fa3b797c44 100644
--- a/py/_builtin.py
+++ b/py/_builtin.py
@@ -107,6 +107,12 @@ except NameError:
 
 _sysex = (KeyboardInterrupt, SystemExit, MemoryError, GeneratorExit)
 
+try:
+    callable = callable
+except NameError:
+    def callable(obj):
+        return hasattr(obj, "__call__")
+
 if sys.version_info >= (3, 0):
     exec ("print_ = print ; exec_=exec")
     import builtins
@@ -128,6 +134,10 @@ if sys.version_info >= (3, 0):
     def _istext(x):
         return isinstance(x, str)
 
+    text = str
+    bytes = bytes
+
+
     def _getimself(function):
         return getattr(function, '__self__', None)
 
@@ -153,13 +163,12 @@ if sys.version_info >= (3, 0):
         co = compile(source, fn, "exec", dont_inherit=True)
         exec_(co, globs, locs)
 
-    def callable(obj):
-        return hasattr(obj, "__call__")
-
 else:
     import __builtin__ as builtins
     _totext = unicode
     _basestring = basestring
+    text = unicode
+    bytes = str
     execfile = execfile
     callable = callable
     def _isbytes(x):
@@ -231,7 +240,9 @@ def _tryimport(*names):
     assert names
     for name in names:
         try:
-            return __import__(name, None, None, '__doc__')
+            __import__(name)
         except ImportError:
             excinfo = sys.exc_info()
+        else:
+            return sys.modules[name]
     _reraise(*excinfo)