From d1ae81a27e7e2d861e52f67bea8766707fe6a697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristi=20V=C3=AEjdea?= Date: Thu, 9 Aug 2018 03:52:09 +0300 Subject: [PATCH] Fix relative imports --- src/drf_yasg/inspectors/query.py | 3 +-- src/drf_yasg/renderers.py | 12 +++++------- src/drf_yasg/utils.py | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/drf_yasg/inspectors/query.py b/src/drf_yasg/inspectors/query.py index ec8b2ba..0ecc88a 100644 --- a/src/drf_yasg/inspectors/query.py +++ b/src/drf_yasg/inspectors/query.py @@ -3,9 +3,8 @@ from collections import OrderedDict import coreschema from rest_framework.pagination import CursorPagination, LimitOffsetPagination, PageNumberPagination -from drf_yasg.utils import force_real_str - from .. import openapi +from ..utils import force_real_str from .base import FilterInspector, PaginatorInspector diff --git a/src/drf_yasg/renderers.py b/src/drf_yasg/renderers.py index 5fb3d4c..e7d0451 100644 --- a/src/drf_yasg/renderers.py +++ b/src/drf_yasg/renderers.py @@ -4,11 +4,10 @@ from django.shortcuts import render, resolve_url from rest_framework.renderers import BaseRenderer, JSONRenderer, TemplateHTMLRenderer from rest_framework.utils import json -from drf_yasg.openapi import Swagger -from drf_yasg.utils import filter_none - from .app_settings import redoc_settings, swagger_settings from .codecs import VALIDATORS, OpenAPICodecJson, OpenAPICodecYaml +from .openapi import Swagger +from .utils import filter_none class _SpecRenderer(BaseRenderer): @@ -135,11 +134,11 @@ class SwaggerUIRenderer(_UIRenderer): 'oauth2RedirectUrl': swagger_settings.OAUTH2_REDIRECT_URL, 'supportedSubmitMethods': swagger_settings.SUPPORTED_SUBMIT_METHODS, } - data = filter_none(data) + if swagger_settings.VALIDATOR_URL != '': data['validatorUrl'] = self.resolve_url(swagger_settings.VALIDATOR_URL) - return data + return filter_none(data) class ReDocRenderer(_UIRenderer): @@ -159,9 +158,8 @@ class ReDocRenderer(_UIRenderer): 'expandResponses': redoc_settings.EXPAND_RESPONSES, 'pathInMiddle': redoc_settings.PATH_IN_MIDDLE, } - data = filter_none(data) - return data + return filter_none(data) class ReDocOldRenderer(ReDocRenderer): diff --git a/src/drf_yasg/utils.py b/src/drf_yasg/utils.py index 7a54440..0177e0b 100644 --- a/src/drf_yasg/utils.py +++ b/src/drf_yasg/utils.py @@ -11,7 +11,7 @@ from rest_framework.settings import api_settings as rest_framework_settings from rest_framework.utils import encoders, json from rest_framework.views import APIView -from drf_yasg.app_settings import swagger_settings +from .app_settings import swagger_settings logger = logging.getLogger(__name__)