mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Backout a1a05e2724dd: shutil.which(bytes) is a new feature and my patch does not work on Windows

Browse source
This commit is contained in:
Victor Stinner 2013-12-16 23:39:40 +01:00
parent 711e27cd50
commit 1d006a2c0e
4 changed files with 10 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/test/test_shutil.py
View file

@ -1326,7 +1326,6 @@ class TestWhich(unittest.TestCase):
os.chmod(self.temp_file.name, stat.S_IXUSR)
self.addCleanup(self.temp_file.close)
self.dir, self.file = os.path.split(self.temp_file.name)
self.env_path = self.dir
def test_basic(self):
# Given an EXE in a directory, it should be returned.
@ -1395,7 +1394,7 @@ class TestWhich(unittest.TestCase):
def test_environ_path(self):
with support.EnvironmentVarGuard() as env:
env['PATH'] = self.env_path
env['PATH'] = self.dir
rv = shutil.which(self.file)
self.assertEqual(rv, self.temp_file.name)
@ -1403,7 +1402,7 @@ class TestWhich(unittest.TestCase):
base_dir = os.path.dirname(self.dir)
with support.change_cwd(path=self.dir), \
support.EnvironmentVarGuard() as env:
env['PATH'] = self.env_path
env['PATH'] = self.dir
rv = shutil.which(self.file, path='')
self.assertIsNone(rv)
@ -1414,14 +1413,6 @@ class TestWhich(unittest.TestCase):
self.assertIsNone(rv)
class TestWhichBytes(TestWhich):
def setUp(self):
TestWhich.setUp(self)
self.dir = os.fsencode(self.dir)
self.file = os.fsencode(self.file)
self.temp_file.name = os.fsencode(self.temp_file.name)
class TestMove(unittest.TestCase):
def setUp(self):