diff options
author | Bernat Gabor <bgabor8@bloomberg.net> | 2018-10-25 15:38:37 +0100 |
---|---|---|
committer | Bernat Gabor <bgabor8@bloomberg.net> | 2018-10-25 15:40:09 +0100 |
commit | fc18f7614cdc12f3f4cde1115d79d5a85bfcecba (patch) | |
tree | 5008dc0d9dafa60efefc886bcba3977b139b98ee | |
parent | 8a7c50a467f73dd807ba246cd9377e4b41181b79 (diff) | |
download | virtualenv-fc18f7614cdc12f3f4cde1115d79d5a85bfcecba.tar.gz |
activate
-rwxr-xr-x | src/virtualenv.py | 30 | ||||
-rw-r--r-- | virtualenv_embedded/activate.csh | 1 | ||||
-rw-r--r-- | virtualenv_embedded/activate_this.py | 18 | ||||
-rw-r--r-- | virtualenv_embedded/deactivate.bat | 2 |
4 files changed, 26 insertions, 25 deletions
diff --git a/src/virtualenv.py b/src/virtualenv.py index 478e318..00f9831 100755 --- a/src/virtualenv.py +++ b/src/virtualenv.py @@ -2104,7 +2104,7 @@ kaYB/peoyY7aVHzpJnE9e+6I5Z+ji4GMTNJWNuOQq6MA1N25p8pW9HWdVWlfsNpPDbdxjgpaahuw 1M7opCA/FFu1uwxC7L8KUqmto1KyQe3rx0I0Eovdf7BVe67U5c1MzSZ310pddGheZoFPWyytRkzU aCA/I+RkBXhFXr5aWV0SxjhUI6jwdAj8kmhPzX7nTfJFkM3MImp2VdVFFq1vLHSU5szYQK4Ri+Jd xlW2JBtOGcyYVW7SnB3v6RS91g3gKapZ0oWxbHVteYIIq3iv7QeuSrUj6KSqQ+yqsxDj1ivNQxKF -YON10Q+NH/ARS95i5Tuqq2Vxfvc23f/FO6zrtXXmJr+ZtMY9/A15ZXFWtmch2rEQ4g1ryVHH +YON10Q+NH/ARS95i5Tuqq2Vxfvc23f/FO6zrtXXmJr+ZtMY9/A15ZXFWtmch2rEQbxoCUb0= """ ) @@ -2124,10 +2124,10 @@ MCqnOxv7/x7Np6yv9P2Ker5dmX8yNyCkkWnbZy3N5LarczlqL8htx2EM9rQ/2H5BvIsIEi8OEG8U # file deactivate.bat DEACTIVATE_BAT = convert( """ -eJyFkN0KgkAUhO8F32EQpHqFQEjQUPAPMaErqVxzId3IrV6/XST/UDx3c86c4WMO5FYysKJQFVVp -CEfqxsnJ9DI7SA25i20fFqs3HO+GYLsDZ7h8GM3xfLHrg1QNvpSX4CWpQGvokZk4uqrQAjXjyElB -a5IjCz0r+2dHcehHCe5MZNmB5R7TdqMqECMptHZh6DN/utb7Zs6Cej8OXYE5J04YOKFvD4GkHuJ0 -pilSd1jG6n87tDZ+BUwUOepI6CGSkFMYWf0ihvT33Qj1A+tCkSI= +eJyFkN0KgkAUhO8XfIdBkOoVAqFAQyF/EBO6ksrdXCg3cqvXbxdJTRTP3ZwzZ/iYDb2UAoIxgxik +phKZn6SH7T53w8zWu8QN4IhqIfGqKZYrSIHTW/ACj6c43+i9xofLErKkd/AKVrxNPcsgnKESEgVl +vKIF8mjv5L/sOImCOMVVqCw3dPxd1mwMAjWawmwWtjXyZ5mdb+SsqNf/oTMwx9SLQi8K3D6Q1n2c +1jREag/TWN1vi9bEz4CpIv86UrqPpOQQRlc/iaH9XTdKkS98fZEs """ ) @@ -2265,16 +2265,16 @@ xJ4EFmGbvfJiicSHFRzUSISMY6hq3GLCRLnIvSTnEefN0FIjw5tF0Hkk9Q5dRunBsVoyFi24aaLg # file activate_this.py ACTIVATE_THIS = convert( """ -eJyNU01v2zAMvetXEB4K21jnDOstQA4dMGCHbeihlyEIDMWmE62yJEiKE//7kXKdpEWLzYBt8evx -kRSzLPs6wiEoswM8YdMpjUXcq1Dz6RZa1cSiTkJdr86GsoTRHuCotBayiWqQEYGtMCgfD1KjGYBe -5a3p0cRKiEe2NtLAFikftnDco0ko/SFEVgEZ8aRCZDIPY9xbA8pE9M4jfW/B2CjiHq9zbJVZuOQq -siwTIvpxKYCembPAU4Muwi/Z4zfvrZ/MXipKeB8C+qisSZYiWfjJfs+0/MFMdWn1hJcO5U7G/SLa -xVx8zU6VG/PXLXvfsyyzUqjeWR8hjGE+2iCE1W1tQ82hsCJN9dzKaoexyB/uH79TnjwvxcW0ntSb -yZ8jq1Z5Q1UXsyy3gf9nbjTEj7NzQMfCJa/YSmrQ+2D/BqfiOi6sclrGzvoeVivIj8rcfcmnIQRF -7XCyeZI7DFe5/lhlCs5PRf5QW66VXT/NrlQ46oD/D6InkOmi3IQcbhKxAX2g4a+Xd5s3UtCtG2py -m8eg6WYWqR6SL5OjKMGfSrYt/6kxxQtOpeAgj1LXBNmpE2ElmCSIy5H0zFd8gJ924HWijWhb2hRC -6wNEm1QdDZtuSZcEprIUBo/XRNcbQe1OUbQ/r3hPTaPJJDNtFLu8KHV5XoNr3Eo6h6YtOKw8e8yw -VF5PnJ+ts3a9/Mz38RpG/AUSzYUW +eJyNU8Fu2zAMvesrCA1FbSxzhvUWIIcOGLDDNvTQyxAEhmLTiVZZMiTFif9+pFwnbtFiM2BbFJ8e ++ShSSvl1gGPQdg94xqrRBrN40KHk1QJqXcWsTEZZri+OPIfBHeGkjRGqirpXEYG90Gsfj8qg7YFe +7Z1t0cZCiEf2VsrCDike1nA6oE0s7TFE3gJy4lmHyMk8DPHgLGgb0Xce6bsA66KIB5zH2Gm77BJU +SCmFiH5YCaBnylngucIuwi/V4jfvnR/dXmkKeB8C+qidTZ4sefiRv6e0/NGOuox+wmuFbjsVD8vo +lpP4kkFFN9y+Ltn7yDyXKWAudNs5H8GFaRV0xMt6CEI4U5culMwFawIWz7Ut9hgz+XD/+F0uQMpc +XF2bcXs74vlkUWtvqQzZZKtd4P8lWbrVjxM4YMfGNa7YKarY+2T/JiehDcspOqNi43wL6zXIk7Z3 +X+R4K6ybglVPao9hFuuP0zbj+CTyh96xVoZ+mqAkHE3A/ycxI8nYOTdBwk1KrEcfqBs2q7vtGyGo +DfuSYNM1GGrVLOkhOxeC8YWqa/5TNbIXieSCkR6VKYmn0WciSGeTIa5L2uckxQf46XoeKpqLuqZ5 +IbY2QHRpq6Ebpo5pksHxV8LiaZ7dZiuoxukUTdGrZMdK0XUkN80VQ17oW12GYc5bqK5DW2d8LL8g +JlqS11LOz95pd7P6zE04pxF/AX70hVA= """ ) diff --git a/virtualenv_embedded/activate.csh b/virtualenv_embedded/activate.csh index 864865b..2355e77 100644 --- a/virtualenv_embedded/activate.csh +++ b/virtualenv_embedded/activate.csh @@ -33,4 +33,3 @@ unset env_name alias pydoc python -m pydoc rehash - diff --git a/virtualenv_embedded/activate_this.py b/virtualenv_embedded/activate_this.py index f18193b..444d3fd 100644 --- a/virtualenv_embedded/activate_this.py +++ b/virtualenv_embedded/activate_this.py @@ -9,19 +9,21 @@ try: __file__ except NameError: raise AssertionError( - "You must run this like execfile('path/to/activate_this.py', dict(__file__='path/to/activate_this.py'))") -import sys + "You must run this like execfile('path/to/activate_this.py', dict(__file__='path/to/activate_this.py'))" + ) import os +import site +import sys -old_os_path = os.environ.get('PATH', '') -os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + os.pathsep + old_os_path +old_os_path = os.environ.get("PATH", "") +os.environ["PATH"] = os.path.dirname(os.path.abspath(__file__)) + os.pathsep + old_os_path base = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -if sys.platform == 'win32': - site_packages = os.path.join(base, 'Lib', 'site-packages') +if sys.platform == "win32": + site_packages = os.path.join(base, "Lib", "site-packages") else: - site_packages = os.path.join(base, 'lib', 'python%s' % sys.version[:3], 'site-packages') + site_packages = os.path.join(base, "lib", "python%s" % sys.version[:3], "site-packages") prev_sys_path = list(sys.path) -import site + site.addsitedir(site_packages) sys.real_prefix = sys.prefix sys.prefix = base diff --git a/virtualenv_embedded/deactivate.bat b/virtualenv_embedded/deactivate.bat index 74d3671..7bbc568 100644 --- a/virtualenv_embedded/deactivate.bat +++ b/virtualenv_embedded/deactivate.bat @@ -16,4 +16,4 @@ if not defined _OLD_VIRTUAL_PYTHONHOME goto ENDIFVHOME if not defined _OLD_VIRTUAL_PATH goto ENDIFVPATH set "PATH=%_OLD_VIRTUAL_PATH%" set _OLD_VIRTUAL_PATH= -:ENDIFVPATH
\ No newline at end of file +:ENDIFVPATH |