From c6f683b5b8a9260c51e65f9b0035386f66c23ae2 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 29 Jan 2025 08:35:18 +0000 Subject: [PATCH] PoC: use moved module django.contrib.admindocs.regex if available --- rest_framework/schemas/generators.py | 7 ++++++- tox.ini | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/rest_framework/schemas/generators.py b/rest_framework/schemas/generators.py index f59e25c21..49a561fec 100644 --- a/rest_framework/schemas/generators.py +++ b/rest_framework/schemas/generators.py @@ -7,7 +7,12 @@ import re from importlib import import_module from django.conf import settings -from django.contrib.admindocs.views import simplify_regex + +try: + from django.contrib.admindocs.regex import simplify_regex +except ImportError: + from django.contrib.admindocs.views import simplify_regex + from django.core.exceptions import PermissionDenied from django.http import Http404 from django.urls import URLPattern, URLResolver diff --git a/tox.ini b/tox.ini index f565a1281..b316ef415 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] envlist = {py38,py39}-{django42} - {py310}-{django42,django50,django51,djangomain} - {py311}-{django42,django50,django51,djangomain} - {py312}-{django42,django50,django51,djangomain} - {py313}-{django51,djangomain} + {py310}-{django42,django50,django51,djangomain,djangofork} + {py311}-{django42,django50,django51,djangomain,djangofork} + {py312}-{django42,django50,django51,djangomain,djangofork} + {py313}-{django51,djangomain,djangofork} base dist docs @@ -20,6 +20,7 @@ deps = django50: Django>=5.0,<5.1 django51: Django>=5.1,<5.2 djangomain: https://github.com/django/django/archive/main.tar.gz + djangofork: https://github.com/browniebroke/django/archive/split-admindocs-regexes-utils.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt setuptools