Permalink
Browse files

Merge branch 'hotfix/1.6.3'

  • Loading branch information...
2 parents f803814 + e0cf4e7 commit 12f7b05fc4f46f7d7018b40e2f31615e385e3bc0 @jezdez jezdez committed Jul 16, 2011
Showing with 18 additions and 10 deletions.
  1. +1 −1 docs/conf.py
  2. +5 −0 docs/news.txt
  3. +1 −1 setup.py
  4. +1 −1 tests/test_virtualenv.py
  5. +10 −7 virtualenv.py
View
@@ -42,7 +42,7 @@
#
# The short X.Y version.
-release = "1.6.2"
+release = "1.6.3"
version = ".".join(release.split(".")[:2])
# There are two options for replacing |today|: either, you set today to some
View
@@ -6,6 +6,11 @@ Next release (1.7) schedule
Beta release mid-July 2011, final release early August.
+1.6.3 (2011-07-16)
+~~~~~~~~~~~~~~~~~~
+
+* Restored ability to run on Python < 2.7.
+
1.6.2 (2011-07-16)
~~~~~~~~~~~~~~~~~~
View
@@ -26,7 +26,7 @@
setup(name='virtualenv',
# If you change the version here, change it in virtualenv.py and
# docs/conf.py as well
- version="1.6.2",
+ version="1.6.3",
description="Virtual Python Environment builder",
long_description=long_description,
classifiers=[
View
@@ -4,7 +4,7 @@
def test_version():
"""Should have a version string"""
- assert virtualenv.virtualenv_version == "1.6.2", "Should have version"
+ assert virtualenv.virtualenv_version == "1.6.3", "Should have version"
@patch('os.path.exists')
View
@@ -4,7 +4,7 @@
# If you change the version here, change it in setup.py
# and docs/conf.py as well.
-virtualenv_version = "1.6.2"
+virtualenv_version = "1.6.3"
import base64
import sys
@@ -13,7 +13,6 @@
import re
import shutil
import logging
-import sysconfig
import tempfile
import zlib
import errno
@@ -1273,11 +1272,15 @@ def fix_local_scheme(home_dir):
Platforms that use the "posix_local" install scheme (like Ubuntu with
Python 2.7) need to be given an additional "local" location, sigh.
"""
- if sysconfig._get_default_scheme() == 'posix_local':
- local_path = os.path.join(home_dir, 'local')
- if not os.path.exists(local_path):
- os.symlink(os.path.abspath(home_dir), local_path)
-
+ try:
+ import sysconfig
+ except ImportError:
+ pass
+ else:
+ if sysconfig._get_default_scheme() == 'posix_local':
+ local_path = os.path.join(home_dir, 'local')
+ if not os.path.exists(local_path):
+ os.symlink(os.path.abspath(home_dir), local_path)
def fix_lib64(lib_dir):
"""

0 comments on commit 12f7b05

Please sign in to comment.