fix #32 by removing use of 'with' ; add tests for python 2.6 and 2.5

Author: dhellmann

Makefile

@@ -1,6 +1,15 @@
 # Get the version of the app.  This is used in the doc build.
 export VERSION=$(shell python setup.py --version)
 
+# The main version of Python supported.
+PRIMARY_PYTHON_VERSION=2.6
+
+# The test-quick pattern changes the definition of
+# this variable to only run against a single version of python.
+ifeq ($(SUPPORTED_PYTHON_VERSIONS),)
+SUPPORTED_PYTHON_VERSIONS=2.5 2.6
+endif
+
 # Default target is to show help
 help:
 	@echo "sdist          - Source distribution"
@@ -44,7 +53,7 @@ docs/sphinx/web/templates/base.html: ~/Devel/doughellmann/doughellmann/templates
 TEST_SCRIPTS=$(wildcard tests/test*.sh)
 
 .PHONY: develop test test-bash test-sh test-zsh test-loop test-install
-test: develop test-bash test-sh test-zsh test-install
+test: test-bash test-sh test-zsh test-install
 
 develop:
 	python setup.py develop
@@ -58,13 +67,26 @@ test-sh:
 test-zsh:
 	TEST_SHELL="zsh -o shwordsplit" $(MAKE) test-loop
 
+# For each supported version of Python,
+# - Create a new virtualenv in a temporary directory.
+# - Install virtualenvwrapper into the new virtualenv
+# - Run each test script in tests
 test-loop:
-	@for test_script in $(wildcard tests/test*.sh) ; do \
-	 	echo '********************************************************************************' ; \
-		echo "Running $$test_script with $(TEST_SHELL)" ; \
-		SHUNIT_PARENT=$$test_script $(TEST_SHELL) $$test_script || exit 1 ; \
-		echo ; \
+	for py_ver in $(SUPPORTED_PYTHON_VERSIONS) ; do \
+		(cd $$TMPDIR/ && rm -rf virtualenvwrapper-test-env \
+			&& virtualenv -p /Library/Frameworks/Python.framework/Versions/$$py_ver/bin/python$$py_ver --no-site-packages virtualenvwrapper-test-env) \
+			|| exit 1 ; \
+		$$TMPDIR/virtualenvwrapper-test-env/bin/python setup.py install || exit 1 ; \
+		for test_script in $(wildcard tests/test*.sh) ; do \
+	 		echo '********************************************************************************' ; \
+			echo "Running $$test_script with $(TEST_SHELL) under Python $$py_ver" ; \
+			VIRTUALENVWRAPPER_PYTHON=$$TMPDIR/virtualenvwrapper-test-env/bin/python SHUNIT_PARENT=$$test_script $(TEST_SHELL) $$test_script || exit 1 ; \
+			echo ; \
+		done \
 	done
 
+test-quick:
+	SUPPORTED_PYTHON_VERSIONS=$(PRIMARY_PYTHON_VERSION) $(MAKE) test-bash
+
 test-install:
 	bash ./tests/manual_test_install.sh `pwd`/dist "$(VERSION)"

tests/test.sh

@@ -3,13 +3,14 @@
 #set -x
 
 test_dir=$(dirname $0)
-source "$test_dir/../virtualenvwrapper.sh"
 
 export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
     mkdir -p "$WORKON_HOME"
+    source "$test_dir/../virtualenvwrapper.sh"
+    echo $PYTHONPATH
 }
 
 oneTimeTearDown() {

tests/test_add2virtualenv.sh

@@ -3,13 +3,13 @@
 #set -x
 
 test_dir=$(dirname $0)
-source "$test_dir/../virtualenvwrapper.sh"
 
 export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
     mkdir -p "$WORKON_HOME"
+    source "$test_dir/../virtualenvwrapper.sh"
 }
 
 oneTimeTearDown() {

tests/test_cd.sh

@@ -3,13 +3,13 @@
 #set -x
 
 test_dir=$(dirname $0)
-source "$test_dir/../virtualenvwrapper.sh"
 
 export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
     mkdir -p "$WORKON_HOME"
+    source "$test_dir/../virtualenvwrapper.sh"
 }
 
 oneTimeTearDown() {

tests/test_cp.sh

@@ -3,13 +3,13 @@
 #set -x
 
 test_dir=$(dirname $0)
-source "$test_dir/../virtualenvwrapper.sh"
 
 export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
 
 setUp () {
     rm -rf "$WORKON_HOME"
     mkdir -p "$WORKON_HOME"
+    source "$test_dir/../virtualenvwrapper.sh"
     echo
     rm -f "$test_dir/catch_output"
 }

tests/test_ls.sh

@@ -3,13 +3,13 @@
 #set -x
 
 test_dir=$(dirname $0)
-source "$test_dir/../virtualenvwrapper.sh"
 
 export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
     mkdir -p "$WORKON_HOME"
+    source "$test_dir/../virtualenvwrapper.sh"
 }
 
 oneTimeTearDown() {

tests/test_rmvirtualenv.sh

@@ -3,13 +3,13 @@
 #set -x
 
 test_dir=$(dirname $0)
-source "$test_dir/../virtualenvwrapper.sh"
 
 export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
     mkdir -p "$WORKON_HOME"
+    source "$test_dir/../virtualenvwrapper.sh"
 }
 
 oneTimeTearDown() {

tests/test_tmpdir.sh

@@ -3,7 +3,6 @@
 #set -x
 
 test_dir=$(dirname $0)
-#source "$test_dir/../virtualenvwrapper.sh"
 
 export SCRATCH_DIR="${TMPDIR:-/tmp}/test_scratch_dir"
 

virtualenvwrapper.sh

@@ -52,7 +52,10 @@ then
 fi
 
 # Locate the global Python where virtualenvwrapper is installed.
-VIRTUALENVWRAPPER_PYTHON="$(which python)"
+if [ "$VIRTUALENVWRAPPER_PYTHON" = "" ]
+then
+    VIRTUALENVWRAPPER_PYTHON="$(which python)"
+fi
 
 # Normalize the directory name in case it includes 
 # relative path components.

virtualenvwrapper/user_scripts.py

@@ -100,11 +100,14 @@ def make_hook(filename, comment):
     filename = os.path.expanduser(os.path.expandvars(filename))
     if not os.path.exists(filename):
         log.info('Creating %s', filename)
-        with open(filename, 'wt') as f:
+        f = open(filename, 'wt')
+        try:
             f.write("""#!%(shell)s
 # %(comment)s
 
 """ % {'comment':comment, 'shell':os.environ.get('SHELL', '/bin/sh')})
+        finally:
+            f.close()
         os.chmod(filename, PERMISSIONS)
     return