diff options
| author | Michael Trier <mtrier@gmail.org> | 2011-03-08 23:40:59 -0500 |
|---|---|---|
| committer | Michael Trier <mtrier@gmail.org> | 2011-03-08 23:40:59 -0500 |
| commit | a1288bf78f887aeef890e4e6cc0f769f4d6a81f5 (patch) | |
| tree | bf612f0f62afbf929126e324305aae01abc4b2f6 /lib/sqlalchemy/util | |
| parent | 438c31e6d50b5eb51920429a4ac61e84eed8828d (diff) | |
| download | sqlalchemy-a1288bf78f887aeef890e4e6cc0f769f4d6a81f5.tar.gz | |
Modifications for PyPy support from Alex Gaynor.
Diffstat (limited to 'lib/sqlalchemy/util')
| -rw-r--r-- | lib/sqlalchemy/util/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/util/compat.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py index 015cc43db..96026c952 100644 --- a/lib/sqlalchemy/util/__init__.py +++ b/lib/sqlalchemy/util/__init__.py @@ -5,7 +5,7 @@ # the MIT License: http://www.opensource.org/licenses/mit-license.php from compat import callable, cmp, reduce, defaultdict, py25_dict, \ - threading, py3k, jython, win32, set_types, buffer, pickle, \ + threading, py3k, jython, pypy, win32, set_types, buffer, pickle, \ update_wrapper, partial, md5_hex, decode_slice, dottedgetter from _collections import NamedTuple, ImmutableContainer, immutabledict, \ diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index 6b6051973..5aea70f24 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -19,6 +19,7 @@ except ImportError: py3k = getattr(sys, 'py3kwarning', False) or sys.version_info >= (3, 0) jython = sys.platform.startswith('java') +pypy = hasattr(sys, 'pypy_version_info') win32 = sys.platform.startswith('win') if py3k: |