Use compat fspath instead of os.fspath

When 7ba35c4 was cherry-picked it introduced the usage of os.fspath which is not supported on Python <3.6
pallets · May 14, 2021 · 1f5b2a5 · 1f5b2a5
1 parent c04b0de
commit 1f5b2a5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/flask/helpers.py b/src/flask/helpers.py
@@ -1001,7 +1001,7 @@ def static_folder(self):
     @static_folder.setter
     def static_folder(self, value):
         if value is not None:
-            value = os.fspath(value).rstrip(r"\/")
+            value = fspath(value).rstrip(r"\/")
         self._static_folder = value
 
     @property

diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -1425,7 +1425,6 @@ def test_static_url_empty_path_default(app):
     rv.close()
 
 
-@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires Python >= 3.6")
 def test_static_folder_with_pathlib_path(app):
     from pathlib import Path