parent
1781347999
commit
e63abd631f
|
@ -151,6 +151,7 @@ initpkg(__name__,
|
||||||
'builtin._totext' : ('./builtin/builtin31.py', '_totext'),
|
'builtin._totext' : ('./builtin/builtin31.py', '_totext'),
|
||||||
'builtin.builtins' : ('./builtin/builtin31.py', 'builtins'),
|
'builtin.builtins' : ('./builtin/builtin31.py', 'builtins'),
|
||||||
'builtin.execfile' : ('./builtin/builtin31.py', 'execfile'),
|
'builtin.execfile' : ('./builtin/builtin31.py', 'execfile'),
|
||||||
|
'builtin.callable' : ('./builtin/builtin31.py', 'callable'),
|
||||||
|
|
||||||
# gateways into remote contexts
|
# gateways into remote contexts
|
||||||
'execnet.__doc__' : ('./execnet/__init__.py', '__doc__'),
|
'execnet.__doc__' : ('./execnet/__init__.py', '__doc__'),
|
||||||
|
|
|
@ -26,10 +26,14 @@ if sys.version_info >= (3, 0):
|
||||||
fp.close()
|
fp.close()
|
||||||
exec_(source, globs, locs)
|
exec_(source, globs, locs)
|
||||||
|
|
||||||
|
def callable(obj):
|
||||||
|
return hasattr(obj, "__call__")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
_totext = unicode
|
_totext = unicode
|
||||||
_basestring = basestring
|
_basestring = basestring
|
||||||
execfile = execfile
|
execfile = execfile
|
||||||
|
callable = callable
|
||||||
|
|
||||||
import __builtin__ as builtins
|
import __builtin__ as builtins
|
||||||
def print_(*args, **kwargs):
|
def print_(*args, **kwargs):
|
||||||
|
|
|
@ -96,6 +96,15 @@ def test_execfile(tmpdir):
|
||||||
py.builtin.execfile(str(test_file))
|
py.builtin.execfile(str(test_file))
|
||||||
assert A.x == 3
|
assert A.x == 3
|
||||||
|
|
||||||
|
def test_callable():
|
||||||
|
class A: pass
|
||||||
|
assert py.builtin.callable(test_callable)
|
||||||
|
assert py.builtin.callable(A)
|
||||||
|
assert py.builtin.callable(list)
|
||||||
|
assert py.builtin.callable(id)
|
||||||
|
assert not py.builtin.callable(4)
|
||||||
|
assert not py.builtin.callable("hi")
|
||||||
|
|
||||||
def test_totext():
|
def test_totext():
|
||||||
py.builtin._totext("hello", "UTF-8")
|
py.builtin._totext("hello", "UTF-8")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue