aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-06-13 11:06:04 -0400
committerJason R. Coombs <jaraco@jaraco.com>2015-06-13 11:06:04 -0400
commit8db6fc33bf38771957e67db90e66486243bcd8c2 (patch)
treefb15a1a227efce8e0aedcb5a55e27f7090514dc2 /setuptools
parente5588b705a2418bd7c46aeae4971f7ebe4bd6ead (diff)
parent79e447fcc29d4591f1a4b3403840357e8bccb234 (diff)
downloadexternal_python_setuptools-8db6fc33bf38771957e67db90e66486243bcd8c2.tar.gz
external_python_setuptools-8db6fc33bf38771957e67db90e66486243bcd8c2.tar.bz2
external_python_setuptools-8db6fc33bf38771957e67db90e66486243bcd8c2.zip
Merge fix
Diffstat (limited to 'setuptools')
-rw-r--r--setuptools/tests/test_easy_install.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index e71bbfc9..a690315d 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -488,9 +488,11 @@ class TestCommandSpec:
cmd_new = ei.CommandSpec.from_param(cmd)
assert cmd is cmd_new
+ @mock.patch('sys.executable', TestScriptHeader.exe_with_spaces)
+ @mock.patch.dict(os.environ)
def test_from_environment_with_spaces_in_executable(self):
- with mock.patch('sys.executable', TestScriptHeader.exe_with_spaces):
- cmd = ei.CommandSpec.from_environment()
+ del os.environ['__PYVENV_LAUNCHER__']
+ cmd = ei.CommandSpec.from_environment()
assert len(cmd) == 1
assert cmd.as_header().startswith('#!"')