Skip to content

Commit c6f683b

Browse files
committed
PoC: use moved module django.contrib.admindocs.regex if available
1 parent 038670a commit c6f683b

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

rest_framework/schemas/generators.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@
77
from importlib import import_module
88

99
from django.conf import settings
10-
from django.contrib.admindocs.views import simplify_regex
10+
11+
try:
12+
from django.contrib.admindocs.regex import simplify_regex
13+
except ImportError:
14+
from django.contrib.admindocs.views import simplify_regex
15+
1116
from django.core.exceptions import PermissionDenied
1217
from django.http import Http404
1318
from django.urls import URLPattern, URLResolver

tox.ini

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[tox]
22
envlist =
33
{py38,py39}-{django42}
4-
{py310}-{django42,django50,django51,djangomain}
5-
{py311}-{django42,django50,django51,djangomain}
6-
{py312}-{django42,django50,django51,djangomain}
7-
{py313}-{django51,djangomain}
4+
{py310}-{django42,django50,django51,djangomain,djangofork}
5+
{py311}-{django42,django50,django51,djangomain,djangofork}
6+
{py312}-{django42,django50,django51,djangomain,djangofork}
7+
{py313}-{django51,djangomain,djangofork}
88
base
99
dist
1010
docs
@@ -20,6 +20,7 @@ deps =
2020
django50: Django>=5.0,<5.1
2121
django51: Django>=5.1,<5.2
2222
djangomain: https://github.com/django/django/archive/main.tar.gz
23+
djangofork: https://github.com/browniebroke/django/archive/split-admindocs-regexes-utils.tar.gz
2324
-rrequirements/requirements-testing.txt
2425
-rrequirements/requirements-optionals.txt
2526
setuptools

0 commit comments

Comments
 (0)