diff options
| author |   Ronan Lamy <ronan.lamy@gmail.com> | 2014-04-12 21:31:36 +0100 |
|---|---|---|
| committer | Ronan Lamy <ronan.lamy@gmail.com> | 2014-04-12 21:31:36 +0100 |
| commit | 916acb5e03a8f9f20746015d703429493ce0e7cc (patch) | |
| tree | 017695471ef62c5da47035720801e6c2bad068c3 /py/__init__.py | |
| parent | A bit more tweaking of details of specialization of some strange jmp (diff) | |
| download | pypy-916acb5e03a8f9f20746015d703429493ce0e7cc.tar.gz pypy-916acb5e03a8f9f20746015d703429493ce0e7cc.tar.bz2 pypy-916acb5e03a8f9f20746015d703429493ce0e7cc.zip | |
sync to pytest 2.5.2 and pylib 1.4.20
Diffstat (limited to 'py/__init__.py')
| -rw-r--r-- | py/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/py/__init__.py b/py/__init__.py index bf6c2128fa..c94f0699c5 100644 --- a/py/__init__.py +++ b/py/__init__.py @@ -6,9 +6,9 @@ and classes. The initpkg-dictionary below specifies name->value mappings where value can be another namespace dictionary or an import path. -(c) Holger Krekel and others, 2004-2010 +(c) Holger Krekel and others, 2004-2013 """ -__version__ = '1.4.7' +__version__ = '1.4.20' from py import _apipkg @@ -104,6 +104,8 @@ _apipkg.initpkg(__name__, attr={'_apipkg': _apipkg}, exportdefs={ 'builtins' : '._builtin:builtins', 'execfile' : '._builtin:execfile', 'callable' : '._builtin:callable', + 'bytes' : '._builtin:bytes', + 'text' : '._builtin:text', }, # input-output helping |