Merge pull request #208 from tomaszn/python_compat

Bring back compatibility with Python < 3.9

Author: agusmakmun

.github/workflows/run-tests.yml

@@ -16,6 +16,10 @@ jobs:
         os: [ macos-latest, ubuntu-latest ]
         python-version: [ 3.9, "3.10" ]
         django-version: [ 3.2, 4.0, 4.1 ]
+        include:
+          - os: ubuntu-20.04
+            python-version: "3.6"
+            django-version: "3.2"
 
     steps:
       - name: Install system dependencies (windows)

martor/urls.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django
 
 from .settings import MARTOR_MARKDOWNIFY_URL, MARTOR_UPLOAD_URL, MARTOR_SEARCH_USERS_URL
@@ -11,8 +8,13 @@
 )
 
 
-def __normalize(path):
-    return path.removeprefix('/').removesuffix('/')
+def __normalize(path: str) -> str:
+    # to support Python < 3.9 we can't use removeprefix('/').removesuffix('/')
+    if path.startswith("/"):
+        path = path[1:]
+    if path.endswith("/"):
+        path = path[:-1]
+    return path
 
 
 if django.VERSION >= (2, 0):

requirements.txt

@@ -1,5 +1,8 @@
+urllib3<2 ; python_version < '3.7' # urllib3 2.0 dropped support for Python 3.6
+zipp<3.7 ; python_version < '3.7' # zipp 3.7.0 dropped support for Python 3.6
+importlib_metadata<4.9 # # importlib_metadata 4.9.0 dropped support for Python 3.6
 Django>=3.2
-Markdown==3.3.4
+Markdown<3.4
 requests
 bleach
 tzdata