From: Jakub Bogusz Date: Sun, 20 May 2018 18:50:22 +0000 (+0200) Subject: - handle case with python3-scandir module installed X-Git-Tag: auto/th/python-pyfakefs-3.4.1-1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython-pyfakefs.git;a=commitdiff_plain;h=f1c59ea - handle case with python3-scandir module installed --- diff --git a/python-pyfakefs-tests.patch b/python-pyfakefs-tests.patch index 0055212..8038efa 100644 --- a/python-pyfakefs-tests.patch +++ b/python-pyfakefs-tests.patch @@ -18,3 +18,14 @@ dir_path = self.make_path('A', 'B', 'C') self.os.makedirs(self.os.path.join(dir_path, 'D')) link_path = self.make_path('A', 'C') +--- pyfakefs-3.4.1/pyfakefs/fake_filesystem_unittest.py.orig 2018-03-18 08:35:26.000000000 +0100 ++++ pyfakefs-3.4.1/pyfakefs/fake_filesystem_unittest.py 2018-05-20 20:39:45.228782238 +0200 +@@ -70,7 +70,7 @@ + + try: + import scandir # noqa: F401 import used to set has_scandir +- import fake_scandir ++ from pyfakefs import fake_scandir + has_scandir = True + except ImportError: + has_scandir = False