Skip to content

Commit 53ef207

Browse files
mrbean-bremenmrbean-bremen
committed
Fix handling of byte strings in some os.path functions
- includes exists(), isfile(), islink(), isdir() and ismount() - fixes #595 - comment docker tests (handled in another issue)
1 parent 05925ab commit 53ef207

File tree

4 files changed

+53
-28
lines changed

4 files changed

+53
-28
lines changed

‎.github/workflows/pythonpackage.yml

+14-13
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,17 @@ jobs:
9696
fi
9797
shell: bash
9898

99-
dockertests:
100-
runs-on: ubuntu-latest
101-
strategy:
102-
fail-fast: false
103-
matrix:
104-
docker-image: [centos, debian, fedora, ubuntu]
105-
steps:
106-
- uses: actions/checkout@v2
107-
- name: Setup docker container
108-
run: |
109-
docker build -t pyfakefs -f $GITHUB_WORKSPACE/.github/workflows/dockerfiles/Dockerfile_${{ matrix.docker-image }} . --build-arg github_repo=$GITHUB_REPOSITORY --build-arg github_branch=$(basename $GITHUB_REF)
110-
- name: Run tests
111-
run: docker run -t pyfakefs
99+
# setting up up docker containers currently fails
100+
# dockertests:
101+
# runs-on: ubuntu-latest
102+
# strategy:
103+
# fail-fast: false
104+
# matrix:
105+
# docker-image: [centos, debian, fedora, ubuntu]
106+
# steps:
107+
# - uses: actions/checkout@v2
108+
# - name: Setup docker container
109+
# run: |
110+
# docker build -t pyfakefs -f $GITHUB_WORKSPACE/.github/workflows/dockerfiles/Dockerfile_${{ matrix.docker-image }} . --build-arg github_repo=$GITHUB_REPOSITORY --build-arg github_branch=$(basename $GITHUB_REF)
111+
# - name: Run tests
112+
# run: docker run -t pyfakefs

‎CHANGES.md

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ The released versions correspond to PyPi releases.
88
functionality as `pathlib` and is no longer tested separately;
99
the previous behavior broke newer `pathlib` features if `pathlib2`
1010
was installed (see [#592](../../issues/592))
11+
12+
### Fixes
13+
* correctly handle byte paths in `os.path.exists`
14+
(see [#595](../../issues/595))
1115

1216
## [Version 4.4.0](https://pypi.python.org/pypi/pyfakefs/4.4.0) (2021-02-24)
1317
Adds better support for Python 3.8 / 3.9.

‎pyfakefs/fake_filesystem.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,7 @@ def exists(self, file_path, check_link=False):
17811781
"""
17821782
if check_link and self.islink(file_path):
17831783
return True
1784-
file_path = make_string_path(file_path)
1784+
file_path = to_string(make_string_path(file_path))
17851785
if file_path is None:
17861786
raise TypeError
17871787
if not file_path:
@@ -2928,7 +2928,7 @@ def _is_of_type(self, path, st_flag, follow_symlinks=True,
29282928
Raises:
29292929
TypeError: if path is None
29302930
"""
2931-
path = make_string_path(path)
2931+
path = to_string(make_string_path(path))
29322932
if path is None:
29332933
raise TypeError
29342934
try:
@@ -3495,7 +3495,7 @@ def ismount(self, path):
34953495
Under Windows also returns True for drive and UNC roots
34963496
(independent of their existence).
34973497
"""
3498-
path = make_string_path(path)
3498+
path = to_string(make_string_path(path))
34993499
if not path:
35003500
return False
35013501
normed_path = self.filesystem.absnormpath(path)

‎pyfakefs/tests/fake_filesystem_test.py

+32-12
Original file line numberDiff line numberDiff line change
@@ -857,8 +857,8 @@ def tearDown(self):
857857
def check_abspath(self, is_windows):
858858
# the implementation differs in Windows and Posix, so test both
859859
self.filesystem.is_windows_fs = is_windows
860-
filename = u'foo'
861-
abspath = u'!%s' % filename
860+
filename = 'foo'
861+
abspath = '!%s' % filename
862862
self.filesystem.create_file(abspath)
863863
self.assertEqual(abspath, self.path.abspath(abspath))
864864
self.assertEqual(abspath, self.path.abspath(filename))
@@ -914,10 +914,14 @@ def test_abs_path_with_drive_component(self):
914914
def test_isabs_with_drive_component(self):
915915
self.filesystem.is_windows_fs = False
916916
self.assertFalse(self.path.isabs('C:!foo'))
917+
self.assertFalse(self.path.isabs(b'C:!foo'))
917918
self.assertTrue(self.path.isabs('!'))
919+
self.assertTrue(self.path.isabs(b'!'))
918920
self.filesystem.is_windows_fs = True
919921
self.assertTrue(self.path.isabs('C:!foo'))
922+
self.assertTrue(self.path.isabs(b'C:!foo'))
920923
self.assertTrue(self.path.isabs('!'))
924+
self.assertTrue(self.path.isabs(b'!'))
921925

922926
def test_relpath(self):
923927
path_foo = '!path!to!foo'
@@ -957,46 +961,53 @@ def test_samefile(self):
957961
self.assertFalse(self.path.samefile(file_path1, file_path2))
958962
self.assertTrue(
959963
self.path.samefile(file_path1, '!foo!..!foo!bar!..!bar!baz'))
964+
self.assertTrue(
965+
self.path.samefile(file_path1, b'!foo!..!foo!bar!..!bar!baz'))
960966

961967
def test_exists(self):
962968
file_path = 'foo!bar!baz'
969+
file_path_bytes = b'foo!bar!baz'
963970
self.filesystem.create_file(file_path)
964971
self.assertTrue(self.path.exists(file_path))
972+
self.assertTrue(self.path.exists(file_path_bytes))
965973
self.assertFalse(self.path.exists('!some!other!bogus!path'))
966974

967975
def test_lexists(self):
968976
file_path = 'foo!bar!baz'
977+
file_path_bytes = b'foo!bar!baz'
969978
self.filesystem.create_dir('foo!bar')
970979
self.filesystem.create_symlink(file_path, 'bogus')
971980
self.assertTrue(self.path.lexists(file_path))
981+
self.assertTrue(self.path.lexists(file_path_bytes))
972982
self.assertFalse(self.path.exists(file_path))
983+
self.assertFalse(self.path.exists(file_path_bytes))
973984
self.filesystem.create_file('foo!bar!bogus')
974985
self.assertTrue(self.path.exists(file_path))
975986

976987
def test_dirname_with_drive(self):
977988
self.filesystem.is_windows_fs = True
978-
self.assertEqual(u'c:!foo',
979-
self.path.dirname(u'c:!foo!bar'))
989+
self.assertEqual('c:!foo',
990+
self.path.dirname('c:!foo!bar'))
980991
self.assertEqual(b'c:!',
981992
self.path.dirname(b'c:!foo'))
982-
self.assertEqual(u'!foo',
983-
self.path.dirname(u'!foo!bar'))
993+
self.assertEqual('!foo',
994+
self.path.dirname('!foo!bar'))
984995
self.assertEqual(b'!',
985996
self.path.dirname(b'!foo'))
986-
self.assertEqual(u'c:foo',
987-
self.path.dirname(u'c:foo!bar'))
997+
self.assertEqual('c:foo',
998+
self.path.dirname('c:foo!bar'))
988999
self.assertEqual(b'c:',
9891000
self.path.dirname(b'c:foo'))
990-
self.assertEqual(u'foo',
991-
self.path.dirname(u'foo!bar'))
1001+
self.assertEqual('foo',
1002+
self.path.dirname('foo!bar'))
9921003

9931004
def test_dirname(self):
9941005
dirname = 'foo!bar'
9951006
self.assertEqual(dirname, self.path.dirname('%s!baz' % dirname))
9961007

9971008
def test_join_strings(self):
998-
components = [u'foo', u'bar', u'baz']
999-
self.assertEqual(u'foo!bar!baz', self.path.join(*components))
1009+
components = ['foo', 'bar', 'baz']
1010+
self.assertEqual('foo!bar!baz', self.path.join(*components))
10001011

10011012
def test_join_bytes(self):
10021013
components = [b'foo', b'bar', b'baz']
@@ -1031,8 +1042,10 @@ def test_getsize_file_empty(self):
10311042

10321043
def test_getsize_file_non_zero_size(self):
10331044
file_path = 'foo!bar!baz'
1045+
file_path_bytes = b'foo!bar!baz'
10341046
self.filesystem.create_file(file_path, contents='1234567')
10351047
self.assertEqual(7, self.path.getsize(file_path))
1048+
self.assertEqual(7, self.path.getsize(file_path_bytes))
10361049

10371050
def test_getsize_dir_empty(self):
10381051
# For directories, only require that the size is non-negative.
@@ -1053,6 +1066,7 @@ def test_getsize_dir_non_zero_size(self):
10531066
def test_isdir(self):
10541067
self.filesystem.create_file('foo!bar')
10551068
self.assertTrue(self.path.isdir('foo'))
1069+
self.assertTrue(self.path.isdir(b'foo'))
10561070
self.assertFalse(self.path.isdir('foo!bar'))
10571071
self.assertFalse(self.path.isdir('it_dont_exist'))
10581072

@@ -1071,6 +1085,7 @@ def test_isfile(self):
10711085
self.filesystem.create_file('foo!bar')
10721086
self.assertFalse(self.path.isfile('foo'))
10731087
self.assertTrue(self.path.isfile('foo!bar'))
1088+
self.assertTrue(self.path.isfile(b'foo!bar'))
10741089
self.assertFalse(self.path.isfile('it_dont_exist'))
10751090

10761091
def test_get_mtime(self):
@@ -1079,6 +1094,7 @@ def test_get_mtime(self):
10791094
self.assertEqual(10, test_file.st_mtime)
10801095
test_file.st_mtime = 24
10811096
self.assertEqual(24, self.path.getmtime('foo!bar1.txt'))
1097+
self.assertEqual(24, self.path.getmtime(b'foo!bar1.txt'))
10821098

10831099
def test_get_mtime_raises_os_error(self):
10841100
self.assertFalse(self.path.exists('it_dont_exist'))
@@ -1095,6 +1111,8 @@ def test_islink(self):
10951111
# comments in Python/Lib/posixpath.py.
10961112
self.assertTrue(self.path.islink('foo!link_to_file'))
10971113
self.assertTrue(self.path.isfile('foo!link_to_file'))
1114+
self.assertTrue(self.path.islink(b'foo!link_to_file'))
1115+
self.assertTrue(self.path.isfile(b'foo!link_to_file'))
10981116

10991117
self.assertTrue(self.path.isfile('foo!regular_file'))
11001118
self.assertFalse(self.path.islink('foo!regular_file'))
@@ -1111,9 +1129,11 @@ def test_is_link_case_sensitive(self):
11111129
def test_ismount(self):
11121130
self.assertFalse(self.path.ismount(''))
11131131
self.assertTrue(self.path.ismount('!'))
1132+
self.assertTrue(self.path.ismount(b'!'))
11141133
self.assertFalse(self.path.ismount('!mount!'))
11151134
self.filesystem.add_mount_point('!mount')
11161135
self.assertTrue(self.path.ismount('!mount'))
1136+
self.assertTrue(self.path.ismount(b'!mount'))
11171137
self.assertTrue(self.path.ismount('!mount!'))
11181138

11191139
def test_ismount_with_drive_letters(self):

0 commit comments

Comments
 (0)