venv: revert setting VENV_GRAAL_PYTHON_OPTIONS in script templates

Author: cosminbasca

graalpython/lib-python/3/venv/__init__.py

@@ -330,18 +330,6 @@ def replace_variables(self, text, context):
         text = text.replace('__VENV_PROMPT__', context.prompt)
         text = text.replace('__VENV_BIN_NAME__', context.bin_name)
         text = text.replace('__VENV_PYTHON__', context.env_exe)
-        # Truffle change: # Truffle change: we need to set some extra options for the launcher to work
-        text = text.replace(
-            '__VENV_GRAAL_PYTHON_OPTIONS__',
-            "--python.CoreHome='%s' --python.StdLibHome='%s' --python.SysPrefix='%s' --python.SysBasePrefix='%s' --python.Executable='%s'" % (
-                sys.graal_python_core_home,
-                sys.graal_python_stdlib_home,
-                context.env_dir,
-                sys.base_prefix,
-                context.env_exe,
-            )
-        )
-        # End truffle change
         return text
 
     def install_scripts(self, context, path):

graalpython/lib-python/3/venv/scripts/common/activate

@@ -14,14 +14,6 @@ deactivate () {
         unset _OLD_VIRTUAL_PYTHONHOME
     fi
 
-    if [ -n "${_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS:-}" ] ; then
-        GRAAL_PYTHON_OPTIONS="${_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS:-}"
-        export GRAAL_PYTHON_OPTIONS
-        unset _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
-    else
-        unset GRAAL_PYTHON_OPTIONS
-    fi
-
     # This should detect bash and zsh, which have a hash command that must
     # be called to get it to forget past commands.  Without forgetting
     # past commands the $PATH changes we made may not be respected
@@ -52,10 +44,6 @@ _OLD_VIRTUAL_PATH="$PATH"
 PATH="$VIRTUAL_ENV/__VENV_BIN_NAME__:$PATH"
 export PATH
 
-_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS="$GRAAL_PYTHON_OPTIONS"
-GRAAL_PYTHON_OPTIONS="__VENV_GRAAL_PYTHON_OPTIONS__ $GRAAL_PYTHON_OPTIONS"
-export GRAAL_PYTHON_OPTIONS
-
 # unset PYTHONHOME if set
 # this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
 # could use `if (set -u; : $PYTHONHOME) ;` in bash

graalpython/lib-python/3/venv/scripts/nt/Activate.ps1

@@ -15,12 +15,6 @@ function global:deactivate ([switch]$NonDestructive) {
         remove-item env:_OLD_VIRTUAL_PATH
     }
 
-    remove-item env:GRAAL_PYTHON_OPTIONS
-    if (Test-Path env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS) {
-        copy-item env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS env:GRAAL_PYTHON_OPTIONS
-        remove-item env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
-    }
-
     if (Test-Path env:VIRTUAL_ENV) {
         remove-item env:VIRTUAL_ENV
     }
@@ -55,6 +49,3 @@ if (Test-Path env:PYTHONHOME) {
 # Add the venv to the PATH
 copy-item env:PATH env:_OLD_VIRTUAL_PATH
 $env:PATH = "$env:VIRTUAL_ENV\__VENV_BIN_NAME__;$env:PATH"
-
-copy-item env:GRAAL_PYTHON_OPTIONS env:_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
-$env:GRAAL_PYTHON_OPTIONS = "$env:__VENV_GRAAL_PYTHON_OPTIONS__ $env:GRAAL_PYTHON_OPTIONS"

graalpython/lib-python/3/venv/scripts/nt/activate.bat

@@ -38,14 +38,6 @@ if defined _OLD_VIRTUAL_PATH (
 
 set "PATH=%VIRTUAL_ENV%\__VENV_BIN_NAME__;%PATH%"
 
-if defined _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS (
-    set "GRAAL_PYTHON_OPTIONS=%_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS%"
-) else (
-    set "_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS=%GRAAL_PYTHON_OPTIONS%"
-)
-
-set "GRAAL_PYTHON_OPTIONS=__VENV_GRAAL_PYTHON_OPTIONS__ %GRAAL_PYTHON_OPTIONS%"
-
 :END
 if defined _OLD_CODEPAGE (
     "%SystemRoot%\System32\chcp.com" %_OLD_CODEPAGE% > nul

graalpython/lib-python/3/venv/scripts/nt/deactivate.bat

@@ -16,13 +16,6 @@ if defined _OLD_VIRTUAL_PATH (
 
 set _OLD_VIRTUAL_PATH=
 
-set GRAAL_PYTHON_OPTIONS=
-if defined _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS (
-    set "GRAAL_PYTHON_OPTIONS=%_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS%"
-)
-
-set _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS=
-
 set VIRTUAL_ENV=
 
 :END

graalpython/lib-python/3/venv/scripts/posix/activate.csh

@@ -3,7 +3,7 @@
 # Created by Davide Di Blasi <davidedb@gmail.com>.
 # Ported to Python 3.3 venv by Andrew Svetlov <andrew.svetlov@gmail.com>
 
-alias deactivate 'unset GRAAL_PYTHON_OPTIONS; test $?_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS != 0 && setenv GRAAL_PYTHON_OPTIONS "$_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS" && unset _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS; test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate'
+alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate'
 
 # Unset irrelevant variables.
 deactivate nondestructive
@@ -13,8 +13,6 @@ setenv VIRTUAL_ENV "__VENV_DIR__"
 set _OLD_VIRTUAL_PATH="$PATH"
 setenv PATH "$VIRTUAL_ENV/__VENV_BIN_NAME__:$PATH"
 
-set _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS="$GRAAL_PYTHON_OPTIONS"
-setenv GRAAL_PYTHON_OPTIONS "__VENV_GRAAL_PYTHON_OPTIONS__ $GRAAL_PYTHON_OPTIONS"
 
 set _OLD_VIRTUAL_PROMPT="$prompt"
 

graalpython/lib-python/3/venv/scripts/posix/activate.fish

@@ -7,11 +7,6 @@ function deactivate  -d "Exit virtualenv and return to normal shell environment"
         set -gx PATH $_OLD_VIRTUAL_PATH
         set -e _OLD_VIRTUAL_PATH
     end
-    set -e GRAAL_PYTHON_OPTIONS
-    if test -n "$_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS"
-        set -gx GRAAL_PYTHON_OPTIONS $_OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
-        set -e _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS
-    end
     if test -n "$_OLD_VIRTUAL_PYTHONHOME"
         set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME
         set -e _OLD_VIRTUAL_PYTHONHOME
@@ -39,9 +34,6 @@ set -gx VIRTUAL_ENV "__VENV_DIR__"
 set -gx _OLD_VIRTUAL_PATH $PATH
 set -gx PATH "$VIRTUAL_ENV/__VENV_BIN_NAME__" $PATH
 
-set -gx _OLD_VIRTUAL_GRAAL_PYTHON_OPTIONS $GRAAL_PYTHON_OPTIONS
-set -gx GRAAL_PYTHON_OPTIONS "__VENV_GRAAL_PYTHON_OPTIONS__ " $GRAAL_PYTHON_OPTIONS
-
 # unset PYTHONHOME if set
 if set -q PYTHONHOME
     set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME