Add Flask 2.1.0 support

joeyespo · Mar 29, 2022 · b915078 · b915078
1 parent 575498f
commit b915078
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/grip/_compat.py b/grip/_compat.py
@@ -0,0 +1,27 @@
+# TODO: Use Werkzeug's directly after dropping support for older Flask versions
+try:
+    # Use older Flask implementation directly to ensure backwards compatibility
+    from flask import safe_join
+except ImportError:
+    import werkzeug.utils
+    from werkzeug.exceptions import NotFound
+
+    # Use port of Flask 2.0 safe_join to match behavior
+    def safe_join(directory, *pathnames):
+        """Safely join zero or more untrusted path components to a base
+        directory to avoid escaping the base directory.
+
+        :param directory: The trusted base directory.
+        :param pathnames: The untrusted path components relative to the
+            base directory.
+        :return: A safe path.
+        """
+        path = werkzeug.utils.safe_join(directory, *pathnames)
+
+        if path is None:
+            raise NotFound()
+
+        return path
+
+
+__all__ = ['safe_join']
diff --git a/grip/assets.py b/grip/assets.py
@@ -13,7 +13,8 @@
     from urllib.parse import urljoin
 
 import requests
-from werkzeug.utils import safe_join
+
+from ._compat import safe_join
 
 from .constants import (
     STYLE_URLS_SOURCE, STYLE_URLS_RES, STYLE_ASSET_URLS_RE,

diff --git a/grip/readers.py b/grip/readers.py
@@ -8,7 +8,7 @@
 import sys
 from abc import ABCMeta, abstractmethod
 
-from werkzeug.utils import safe_join
+from ._compat import safe_join
 
 from .constants import DEFAULT_FILENAMES, DEFAULT_FILENAME
 from .exceptions import ReadmeNotFoundError

diff --git a/requirements.txt b/requirements.txt
@@ -4,4 +4,4 @@ Markdown>=2.5.1
 path-and-address>=2.0.1
 Pygments>=1.6
 requests>=2.4.1
-Werkzeug>=2.1.0
+Werkzeug>=0.7