support nondescructive argument to deactivate

--HG--
rename : README.rst => README.txt

Author: dhellmann

README.rst renamed to README.txt

@@ -6,7 +6,6 @@ Dev
 
   - Add support for ksh.  Thanks to Doug Latornell for doing the
     research on what needed to be changed.
-  - Switch to ``tempfile`` command for creating temporary hook files.
   - Test import of virtualenvwrapper.hook_loader on startup and report
     the error in a way that should help the user figure out how to fix
     it (issue #33).
@@ -15,6 +14,8 @@ Dev
     created (issue #30).
   - Added hooks around :ref:`command-cpvirtualenv`.
   - Made deactivation more robust, especially under ksh.
+  - Use Python's ``tempfile`` module for creating temporary filenames
+    safely and portably.
 
 2.0.2
 

docs/source/history.rst

@@ -15,7 +15,7 @@
 import sys
 
 try:
-    long_description = open('README.rst', 'rt').read()
+    long_description = open('README.txt', 'rt').read()
 except IOError:
     long_description = ''
 

setup.py

@@ -15,6 +15,10 @@ setUp () {
 }
 
 tearDown() {
+    if type deactivate >/dev/null 2>&1
+    then 
+        deactivate
+    fi
     rm -rf "$WORKON_HOME"
 }
 
@@ -73,7 +77,6 @@ GLOBAL postcpvirtualenv"
     assertSame "$expected" "$output"
     rm -f "$WORKON_HOME/premkvirtualenv"
     rm -f "$WORKON_HOME/postmkvirtualenv"
-    deactivate
 }
 
 . "$test_dir/shunit2"

tests/test_cp.sh

@@ -240,11 +240,6 @@ workon () {
     virtualenvwrapper_original_deactivate=`typeset -f deactivate | sed 's/deactivate/virtualenv_deactivate/g'`
     eval "$virtualenvwrapper_original_deactivate"
     unset -f deactivate >/dev/null 2>&1
-#     virtualenvwrapper_saved_deactivate=$(virtualenvwrapper_tempfile)
-#     $(typeset -f deactivate | sed 's/deactivate/original_deactivate/g' > $virtualenvwrapper_saved_deactivate)
-#     echo "original_deactivate" >> $virtualenvwrapper_saved_deactivate
-#     echo "SAVED: \"$virtualenvwrapper_saved_deactivate\""
-#     cat $virtualenvwrapper_saved_deactivate
 
     # Replace the deactivate() function with a wrapper.
     eval 'deactivate () {
@@ -257,14 +252,16 @@ workon () {
         old_env=$(basename "$VIRTUAL_ENV")
         
         # Call the original function.
-        #source "$virtualenvwrapper_saved_deactivate"
-        #rm -f "$virtualenvwrapper_saved_deactivate"
-        virtualenv_deactivate
+        virtualenv_deactivate $1
 
         virtualenvwrapper_run_hook "post_deactivate" "$old_env"
 
-        # Remove this function
-        unset -f deactivate
+        if [ ! "$1" = "nondestructive" ]
+        then
+            # Remove this function
+            unset -f virtualenv_deactivate
+            unset -f deactivate
+        fi
 
     }'