py3k compatibility

Author: dakra

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_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="$(python -c 'import sys; sys.stdout.write(".".join([str(p) for p in sys.version_info[:2]])+'\n')')"
     echo "Expecting: $expected"
     vers=$(virtualenvwrapper_get_python_version)
     echo "Got      : $vers"

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py26
+envlist = py32,py27,py26
 
 [testenv]
 commands = bash ./tests/run_tests {envdir} []

virtualenvwrapper.sh

@@ -99,7 +99,7 @@ function virtualenvwrapper_derive_workon_home {
         # - Removing extra slashes (e.g., when TMPDIR ends in a slash)
         # - Expanding variables (e.g., $foo)
         # - Converting ~s to complete paths (e.g., ~/ to /home/brian/ and ~arthur to /home/arthur)
-        workon_home_dir=$("$VIRTUALENVWRAPPER_PYTHON" -c "import os; print os.path.expandvars(os.path.expanduser(\"$workon_home_dir\"))")
+        workon_home_dir=$("$VIRTUALENVWRAPPER_PYTHON" -c "import os,sys; sys.stdout.write(os.path.expandvars(os.path.expanduser(\"$workon_home_dir\"))+'\n')")
     fi
 
     echo "$workon_home_dir"
@@ -656,7 +656,7 @@ function add2virtualenv {
 
     for pydir in "$@"
     do
-        absolute_path=$("$VIRTUALENVWRAPPER_PYTHON" -c "import os; print os.path.abspath(\"$pydir\")")
+        absolute_path=$("$VIRTUALENVWRAPPER_PYTHON" -c "import os,sys; sys.stdout.write(os.path.abspath(\"$pydir\")+'\n')")
         if [ "$absolute_path" != "$pydir" ]
         then
             echo "Warning: Converting \"$pydir\" to \"$absolute_path\"" 1>&2
@@ -939,11 +939,11 @@ mktmpenv() {
     typeset RC
 
     # Generate a unique temporary name
-    tmpenvname=$("$VIRTUALENVWRAPPER_PYTHON" -c 'import uuid; print uuid.uuid4()' 2>/dev/null)
+    tmpenvname=$("$VIRTUALENVWRAPPER_PYTHON" -c 'import uuid,sys; sys.stdout.write(uuid.uuid4()+"\n")' 2>/dev/null)
     if [ -z "$tmpenvname" ]
     then
         # This python does not support uuid
-        tmpenvname=$("$VIRTUALENVWRAPPER_PYTHON" -c 'import random; print hex(random.getrandbits(64))[2:-1]' 2>/dev/null)
+        tmpenvname=$("$VIRTUALENVWRAPPER_PYTHON" -c 'import random,sys; sys.stdout.write(hex(random.getrandbits(64))[2:-1]+"\n")' 2>/dev/null)
     fi
 
     # Create the environment

virtualenvwrapper/hook_loader.py

@@ -134,7 +134,7 @@ def run_hooks(hook, options, args, output=None):
             continue
         plugin = ep.load()
         if options.listing:
-            sys.stdout.write('  %-10s -- %s' % (ep.name, inspect.getdoc(plugin) or ''))
+            sys.stdout.write('  %-10s -- %s\n' % (ep.name, inspect.getdoc(plugin) or ''))
             continue
         if options.sourcing:
             # Show the shell commands so they can