Fix some bytes warnings

- make bytes warning an error in test run
- see #651

Author: mrbean-bremen

.github/workflows/pythonpackage.yml

@@ -83,7 +83,7 @@ jobs:
     - name: Run unit tests without extra packages as non-root user
       run: |
         export TEST_REAL_FS=1
-        python -m pyfakefs.tests.all_tests_without_extra_packages
+        python -bb -m pyfakefs.tests.all_tests_without_extra_packages
       shell: bash
     - name: Run setup.py test (uses pytest)
       run: |

pyfakefs/fake_filesystem.py

@@ -1118,8 +1118,9 @@ def _auto_mount_drive_if_needed(self, path: AnyStr,
 
     def _mount_point_for_path(self, path: AnyStr) -> Dict:
         path = self.absnormpath(self._original_path(path))
-        if path in self.mount_points:
-            return self.mount_points[path]
+        for mount_path in self.mount_points:
+            if path == matching_string(path, mount_path):
+                return self.mount_points[mount_path]
         mount_path = matching_string(path, '')
         drive = self.splitdrive(path)[0]
         for root_path in self.mount_points:
@@ -2048,9 +2049,9 @@ def get_object_from_normpath(self,
             OSError: if the object is not found.
         """
         path = make_string_path(file_path)
-        if path == self.root.name:
+        if path == matching_string(path, self.root.name):
             return self.root
-        if path == self.dev_null.name:
+        if path == matching_string(path, self.dev_null.name):
             return self.dev_null
 
         path = self._original_path(path)
@@ -2143,7 +2144,7 @@ def lresolve(self, path: AnyPath) -> FakeFile:
         path_str = make_string_path(path)
         if not path_str:
             raise OSError(errno.ENOENT, path_str)
-        if path_str == self.root.name:
+        if path_str == matching_string(path_str, self.root.name):
             # The root directory will never be a link
             return self.root
 
@@ -3201,7 +3202,7 @@ def rmdir(self, target_directory: AnyStr,
             OSError: if removal failed per FakeFilesystem.RemoveObject.
                 Cannot remove '.'.
         """
-        if target_directory in (b'.', u'.'):
+        if target_directory == matching_string(target_directory, '.'):
             error_nr = errno.EACCES if self.is_windows_fs else errno.EINVAL
             self.raise_os_error(error_nr, target_directory)
         ends_with_sep = self.ends_with_path_separator(target_directory)
@@ -4652,7 +4653,7 @@ def mknod(self, path: AnyStr, mode: Optional[int] = None,
             if self.filesystem.exists(head, check_link=True):
                 self.filesystem.raise_os_error(errno.EEXIST, path)
             self.filesystem.raise_os_error(errno.ENOENT, path)
-        if tail in (b'.', u'.', b'..', u'..'):
+        if tail in (matching_string(tail, '.'), matching_string(tail, '..')):
             self.filesystem.raise_os_error(errno.ENOENT, path)
         if self.filesystem.exists(path, check_link=True):
             self.filesystem.raise_os_error(errno.EEXIST, path)

pyfakefs/tests/fake_filesystem_vs_real_test.py

@@ -182,8 +182,8 @@ def _error_class(exc):
         real_err, real_value = self._get_real_value(method_name, path, real)
         fake_err, fake_value = self._get_fake_value(method_name, path, fake)
 
-        method_call = '%s' % method_name
-        method_call += '()' if path == () else '(%s)' % path
+        method_call = f'{method_name}'
+        method_call += '()' if path == () else '({path})'
         # We only compare on the error class because the acutal error contents
         # is almost always different because of the file paths.
         if _error_class(real_err) != _error_class(fake_err):
@@ -223,7 +223,11 @@ def _get_fake_value(method_name, path, fake):
             if not callable(fake):
                 fake_method = getattr(fake, method_name)
             args = [] if path == () else [path]
-            fake_value = str(fake_method(*args))
+            result = fake_method(*args)
+            if isinstance(result, bytes):
+                fake_value = result.decode()
+            else:
+                fake_value = str(result)
         except Exception as e:  # pylint: disable-msg=W0703
             fake_err = e
         return fake_err, fake_value
@@ -238,7 +242,11 @@ def _get_real_value(method_name, path, real):
             real_method = real
             if not callable(real):
                 real_method = getattr(real, method_name)
-            real_value = str(real_method(*args))
+            result = real_method(*args)
+            if isinstance(result, bytes):
+                real_value = result.decode()
+            else:
+                real_value = str(result)
         except Exception as e:  # pylint: disable-msg=W0703
             real_err = e
         return real_err, real_value