Merge branch 'hotfix/1.6.3'1.6.3

5 files changed, 18 insertions, 10 deletions

diff --git a/docs/conf.py b/docs/conf.py
index c91c708..733bc99 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -42,7 +42,7 @@ copyright = '2007-2011, Ian Bicking, The Open Planning Project, The virtualenv d
 #
 # 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
diff --git a/docs/news.txt b/docs/news.txt
index 2fe7cfb..bc2832b 100644
--- a/docs/news.txt
+++ b/docs/news.txt
@@ -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)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/setup.py b/setup.py
index 63dfa8f..56cd122 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ f.close()
 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=[
diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
index ef95559..da327f8 100644
--- a/tests/test_virtualenv.py
+++ b/tests/test_virtualenv.py
@@ -4,7 +4,7 @@ from mock import patch, Mock
 
 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')
diff --git a/virtualenv.py b/virtualenv.py
index 1a6ea41..331c5c5 100644
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -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 optparse
 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):
     """