merge in support for python 3.2

Author: dhellmann

announce.rst

@@ -1,6 +1,6 @@
-==========================
- virtualenvwrapper 2.11.1
-==========================
+========================
+ virtualenvwrapper 3.0
+========================
 
 What is virtualenvwrapper
 =========================
@@ -11,11 +11,11 @@ virtual environments and otherwise managing your development workflow,
 making it easier to work on more than one project at a time without
 introducing conflicts in their dependencies.
 
-What's New in 2.11.1
-====================
+What's New in 3.0
+=================
 
-- Fixes a bug with tab completion in sub-shell environments such as
-  screen and tmux introduced in 2.11.
+- Add Python 3 support, thanks in large part to the efforts of Daniel
+  Kraus. Tested under Python 2.6, 2.7, and 3.2.
 
 Installing
 ==========

docs/en/history.rst

@@ -2,6 +2,12 @@
 Release History
 ===============
 
+3.0
+
+  - Add Python 3 support, thanks in large part to the efforts of
+    Daniel Kraus (:bbuser:`dakra`). Tested under Python 2.6, 2.7, and
+    3.2.
+
 2.11.1
 
   - Remove the initialization shortcut because it breaks tab

setup.py

@@ -3,7 +3,7 @@
 PROJECT = 'virtualenvwrapper'
 
 # Change docs/sphinx/conf.py too!
-VERSION = '2.11.1'
+VERSION = '3.0'
 
 # Bootstrap installation of Distribute
 import distribute_setup

tests/run_tests

@@ -49,11 +49,11 @@ do
 
     for test_shell in bash ksh zsh
     do
-	test_shell_opts=
-	if [ $test_shell = "zsh" ]; then
+        test_shell_opts=
+        if [ $test_shell = "zsh" ]; then
             test_shell_opts="-o shwordsplit"
-	fi
-	export test_shell=$(which $test_shell)
+        fi
+        export test_shell=$(which $test_shell)
 
         echo
         echo '********************************************************************************'

tests/test.sh

@@ -84,12 +84,6 @@ test_virtualenvwrapper_verify_workon_home_missing_dir_grep_options() {
     unset GREP_OPTIONS
 }
 
-test_get_python_version() {
-    expected=$(python -V 2>&1 | cut -f2 -d' ' | cut -f-2 -d.)
-    actual=$(virtualenvwrapper_get_python_version)
-    assertSame "$expected" "$actual"
-}
-
 test_python_interpreter_set_incorrectly() {
     return_to="$(pwd)"
     cd "$WORKON_HOME"

tests/test_add2virtualenv.sh

@@ -32,7 +32,7 @@ test_add2virtualenv () {
     assertTrue "No path insert code in $(cat $path_file)" "grep -q sys.__egginsert $path_file"
     # Check the path we inserted is actually at the top
     expected="$full_path"
-    actual=$($WORKON_HOME/pathtest/bin/python -c "import sys; print sys.path[1]")
+    actual=$($WORKON_HOME/pathtest/bin/python -c "import sys; sys.stdout.write(sys.path[1]+'\n')")
     assertSame "$expected" "$actual"
     # Make sure the temporary file created
     # during the edit was removed

tests/test_mkvirtualenv.sh

@@ -81,7 +81,7 @@ test_no_workon_home () {
     export WORKON_HOME="$WORKON_HOME/not_there"
     mkvirtualenv should_be_created >"$old_home/output" 2>&1
     output=$(cat "$old_home/output")
-    assertTrue "Did not see expected message" "echo $output | grep 'does not exist'"
+    assertTrue "Did not see expected message in \"$output\"" "cat \"$old_home/output\" | grep 'does not exist'"
     assertTrue "Did not create environment" "[ -d \"$WORKON_HOME/should_be_created\" ]"
     WORKON_HOME="$old_home"
 }

tests/test_mkvirtualenv_install.sh

@@ -23,16 +23,16 @@ setUp () {
 }
 
 test_single_package () {
-    mkvirtualenv -i commandlineapp "env4" >/dev/null 2>&1
+    mkvirtualenv -i IPy "env4"
     installed=$(pip freeze)
-    assertTrue "CommandLineApp not found in $installed" "echo $installed | grep CommandLineApp"
+    assertTrue "IPy not found in $installed" "pip freeze | grep IPy"
 }
 
 test_multiple_packages () {
-    mkvirtualenv -i commandlineapp -i csvcat "env4" >/dev/null 2>&1
+    mkvirtualenv -i IPy -i WebTest "env5"
     installed=$(pip freeze)
-    assertTrue "CommandLineApp not found in $installed" "echo $installed | grep CommandLineApp"
-    assertTrue "csvcat not found in $installed" "echo $installed | grep csvcat"
+    assertTrue "IPy not found in $installed" "pip freeze | grep IPy"
+    assertTrue "WebTest not found in $installed" "pip freeze | grep WebTest"
 }
 
 . "$test_dir/shunit2"

tests/test_mkvirtualenv_requirements.sh

@@ -23,10 +23,10 @@ setUp () {
 }
 
 test_requirements_file () {
-    echo "commandlineapp" > "$test_dir/requirements.txt"
+    echo "IPy" > "$test_dir/requirements.txt"
     mkvirtualenv -r "$test_dir/requirements.txt" "env3" >/dev/null 2>&1
     installed=$(pip freeze)
-    assertTrue "CommandLineApp not found in $installed" "echo $installed | grep CommandLineApp"
+    assertTrue "IPy not found in $installed" "pip freeze | grep IPy"
 }
 
 . "$test_dir/shunit2"

tests/test_support.sh

@@ -22,7 +22,7 @@ setUp () {
 }
 
 test_get_python_version () {
-    expected="$(python -c 'import sys; print ".".join([str(p) for p in sys.version_info[:2]])')"
+    expected="$($VIRTUAL_ENV/bin/python -c 'import sys; sys.stdout.write("%s.%s\n" % sys.version_info[:2])')"
     echo "Expecting: $expected"
     vers=$(virtualenvwrapper_get_python_version)
     echo "Got      : $vers"