From a9ec562196a697c2fbfa16ad741f53831b8ab654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristi=20V=C3=AEjdea?= Date: Sun, 25 Oct 2020 16:59:51 +0200 Subject: [PATCH] Fix DRF 3.12 compatibility --- requirements/test.txt | 2 +- src/drf_yasg/generators.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/test.txt b/requirements/test.txt index 271a360c..bdfea0e1 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -5,7 +5,7 @@ pytest-cov>=2.6.0 pytest-xdist>=1.25.0 pytest-django>=3.4.4 datadiff==2.0.0 -psycopg2-binary==2.8.3 +psycopg2-binary==2.8.6 django-fake-model==0.1.4 -r testproj.txt diff --git a/src/drf_yasg/generators.py b/src/drf_yasg/generators.py index c56c51ad..4da3a1ec 100644 --- a/src/drf_yasg/generators.py +++ b/src/drf_yasg/generators.py @@ -6,9 +6,9 @@ import rest_framework import uritemplate from coreapi.compat import urlparse +from django.urls import URLPattern, URLResolver from packaging.version import Version from rest_framework import versioning -from rest_framework.compat import URLPattern, URLResolver, get_original_route from rest_framework.schemas.generators import EndpointEnumerator as _EndpointEnumerator from rest_framework.schemas.generators import endpoint_ordering, get_pk_name from rest_framework.settings import api_settings @@ -93,7 +93,7 @@ def get_api_endpoints(self, patterns=None, prefix='', app_name=None, namespace=N ignored_endpoints = set() for pattern in patterns: - path_regex = prefix + get_original_route(pattern) + path_regex = prefix + str(pattern.pattern) if isinstance(pattern, URLPattern): try: path = self.get_path_from_regex(path_regex)