diff --git a/src/drf_yasg/generators.py b/src/drf_yasg/generators.py index 9c9a393..c56c51a 100644 --- a/src/drf_yasg/generators.py +++ b/src/drf_yasg/generators.py @@ -3,24 +3,16 @@ import logging import re from collections import OrderedDict, defaultdict -import uritemplate import rest_framework +import uritemplate from coreapi.compat import urlparse +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 -from packaging.version import Version -if Version(rest_framework.__version__) < Version('3.10'): - from rest_framework.schemas.generators import SchemaGenerator - from rest_framework.schemas.inspectors import get_pk_description -else: - from rest_framework.schemas import SchemaGenerator - from rest_framework.schemas.utils import get_pk_description - from . import openapi from .app_settings import swagger_settings from .errors import SwaggerGenerationError @@ -28,6 +20,14 @@ from .inspectors.field import get_basic_type_info, get_queryset_field, get_query from .openapi import ReferenceResolver, SwaggerDict from .utils import force_real_str, get_consumes, get_produces +if Version(rest_framework.__version__) < Version('3.10'): + from rest_framework.schemas.generators import SchemaGenerator + from rest_framework.schemas.inspectors import get_pk_description +else: + from rest_framework.schemas import SchemaGenerator + from rest_framework.schemas.utils import get_pk_description + + logger = logging.getLogger(__name__) PATH_PARAMETER_RE = re.compile(r'{(?P\w+)}') diff --git a/testproj/snippets/serializers.py b/testproj/snippets/serializers.py index 4bbb8ad..4db926a 100644 --- a/testproj/snippets/serializers.py +++ b/testproj/snippets/serializers.py @@ -1,15 +1,17 @@ -import rest_framework from decimal import Decimal +import rest_framework from django.contrib.auth import get_user_model from packaging.version import Version +from rest_framework import serializers + +from snippets.models import LANGUAGE_CHOICES, STYLE_CHOICES, Snippet, SnippetViewer + if Version(rest_framework.__version__) < Version('3.10'): from rest_framework.compat import MaxLengthValidator, MinValueValidator else: from django.core.validators import MaxLengthValidator, MinValueValidator -from rest_framework import serializers -from snippets.models import LANGUAGE_CHOICES, STYLE_CHOICES, Snippet, SnippetViewer class LanguageSerializer(serializers.Serializer):