0.5: Django 3.2 support, drop Django<1.11, Python<3.6, remove some compatibility...

[fnpdjango.git] / fnpdjango / utils / urls.py

diff --git a/fnpdjango/utils/urls.py b/fnpdjango/utils/urls.py
deleted file mode 100644 (file)
index 4e9916f..0000000
--- a/fnpdjango/utils/urls.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""
-Utilities for urlconfs.
-"""
-
-import django
-if django.VERSION >= (1, 10):
-    import warnings
-    from django.conf.urls.i18n import i18n_patterns as django_i18n_patterns
-
-    def i18n_patterns(*args):
-        warnings.warn(
-            "As of Django 1.10, fnpdjango.utils.urls.i18n_patterns "
-            "is deprecated in favor of directly using "
-            "django.urls.i18n_patterns(prefix_default_language=False).",
-            DeprecationWarning)
-        return django_i18n_patterns(*args, prefix_default_language=False)
-
-else:
-    # Django <= 1.9
-    import re
-    from django.conf import settings
-    from django.core.urlresolvers import LocaleRegexURLResolver
-    from django.utils.translation import get_language
-
-    class MyLocaleRegexURLResolver(LocaleRegexURLResolver):
-        """
-        A URL resolver that always matches the active language code as URL prefix.
-
-        Rather than taking a regex argument, we just override the ``regex``
-        function to always return the active language-code as regex.
-        """
-        @property
-        def regex(self):
-            language_code = get_language()
-            if language_code == settings.LANGUAGE_CODE:
-                return re.compile('')
-            if language_code not in self._regex_dict:
-                regex_compiled = re.compile('^%s/' % language_code, re.UNICODE)
-                self._regex_dict[language_code] = regex_compiled
-            return self._regex_dict[language_code]
-
-    def i18n_patterns(*args):
-        """
-        Adds the language code prefix to every URL pattern within this
-        function. This may only be used in the root URLconf, not in an included
-        URLconf.
-        """
-        pattern_list = list(args)
-        if not settings.USE_I18N:
-            return pattern_list
-        return pattern_list + [MyLocaleRegexURLResolver(pattern_list)]