diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2013-04-18 12:09:19 -0700 |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2013-04-18 12:09:19 -0700 |
| commit | 8b4e31380562e46c52ae469fab449b643826e576 (patch) | |
| tree | 972f70722b0942992c327e2ceee621ae4b2fedb8 /virtualenv_embedded | |
| parent | 615cbad60647713941e2610be46aa2152f45624d (diff) | |
| download | virtualenv-8b4e31380562e46c52ae469fab449b643826e576.tar.gz | |
o adapt to pypy's stdlib path change only for py3k
o pypy < 1.9 no longer has a 'modified-' stdlib path
Diffstat (limited to 'virtualenv_embedded')
| -rw-r--r-- | virtualenv_embedded/site.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/virtualenv_embedded/site.py b/virtualenv_embedded/site.py index 68beb56..3de978a 100644 --- a/virtualenv_embedded/site.py +++ b/virtualenv_embedded/site.py @@ -560,13 +560,17 @@ def virtual_install_main_packages(): if _is_jython: paths = [os.path.join(sys.real_prefix, 'Lib')] elif _is_pypy: - if sys.pypy_version_info >= (1, 5): + if sys.version_info > (3, 2): + cpyver = '%d' % sys.version_info[0] + elif sys.pypy_version_info >= (1, 5): cpyver = '%d.%d' % sys.version_info[:2] else: cpyver = '%d.%d.%d' % sys.version_info[:3] paths = [os.path.join(sys.real_prefix, 'lib_pypy'), - os.path.join(sys.real_prefix, 'lib-python', 'modified-%s' % cpyver), os.path.join(sys.real_prefix, 'lib-python', cpyver)] + if sys.pypy_version_info < (1, 9): + paths.insert(1, os.path.join(sys.real_prefix, + 'lib-python', 'modified-%s' % cpyver)) hardcoded_relative_dirs = paths[:] # for the special 'darwin' case below # # This is hardcoded in the Python executable, but relative to sys.prefix: |