Python2 support drop 2

Author: p1c2u

openapi_core/casting/schemas/casters.py

@@ -1,9 +1,7 @@
-from __future__ import division
-
 from openapi_core.casting.schemas.exceptions import CastError
 
 
-class PrimitiveCaster(object):
+class PrimitiveCaster:
 
     def __init__(self, schema, caster_callable):
         self.schema = schema
@@ -18,13 +16,13 @@ def __call__(self, value):
             raise CastError(value, self.schema['type'])
 
 
-class DummyCaster(object):
+class DummyCaster:
 
     def __call__(self, value):
         return value
 
 
-class ArrayCaster(object):
+class ArrayCaster:
 
     def __init__(self, schema, casters_factory):
         self.schema = schema

openapi_core/casting/schemas/factories.py

@@ -4,7 +4,7 @@
 from openapi_core.casting.schemas.util import forcebool
 
 
-class SchemaCastersFactory(object):
+class SchemaCastersFactory:
 
     DUMMY_CASTERS = [
         'string', 'object', 'any',

openapi_core/contrib/django/backports.py

@@ -8,11 +8,11 @@ class HttpHeaders(dict):
 
     def __init__(self, environ):
         headers = {}
-        for header, value in environ.items():
+        for header, value in list(environ.items()):
             name = self.parse_header_name(header)
             if name:
                 headers[name] = value
-        super(HttpHeaders, self).__init__(headers)
+        super().__init__(headers)
 
     @classmethod
     def parse_header_name(cls, header):

openapi_core/contrib/django/compat.py

@@ -13,7 +13,7 @@ def get_request_headers(req):
 def get_response_headers(resp):
     # in Django 2 headers is not defined
     return resp.headers if hasattr(resp, 'headers') else \
-        dict(resp._headers.values())
+        dict(list(resp._headers.values()))
 
 
 def get_current_scheme_host(req):

openapi_core/contrib/django/requests.py

@@ -23,7 +23,7 @@
 PATH_PARAMETER_PATTERN = r'(?:[^\/]*?)<(?:(?:.*?:))*?(\w+)>(?:[^\/]*)'
 
 
-class DjangoOpenAPIRequestFactory(object):
+class DjangoOpenAPIRequestFactory:
 
     path_regex = re.compile(PATH_PARAMETER_PATTERN)
 
@@ -48,7 +48,7 @@ def create(cls, request):
         parameters = RequestParameters(
             path=path,
             query=request.GET,
-            header=headers.items(),
+            header=list(headers.items()),
             cookie=request.COOKIES,
         )
         current_scheme_host = get_current_scheme_host(request)

openapi_core/contrib/django/responses.py

@@ -3,7 +3,7 @@
 from openapi_core.validation.response.datatypes import OpenAPIResponse
 
 
-class DjangoOpenAPIResponseFactory(object):
+class DjangoOpenAPIResponseFactory:
 
     @classmethod
     def create(cls, response):
@@ -12,6 +12,6 @@ def create(cls, response):
         return OpenAPIResponse(
             data=response.content,
             status_code=response.status_code,
-            headers=headers.items(),
+            headers=list(headers.items()),
             mimetype=mimetype,
         )

openapi_core/contrib/falcon/handlers.py

@@ -13,7 +13,7 @@
 )
 
 
-class FalconOpenAPIErrorsHandler(object):
+class FalconOpenAPIErrorsHandler:
 
     OPENAPI_ERROR_STATUS = {
         ServerNotFound: 400,

openapi_core/contrib/falcon/middlewares.py

@@ -18,25 +18,22 @@ def __init__(
             response_factory,
             openapi_errors_handler,
     ):
-        super(FalconOpenAPIMiddleware, self).__init__(
-            request_validator, response_validator)
+        super().__init__(request_validator, response_validator)
         self.request_factory = request_factory
         self.response_factory = response_factory
         self.openapi_errors_handler = openapi_errors_handler
 
     def process_request(self, req, resp):
         openapi_req = self._get_openapi_request(req)
-        req_result = super(FalconOpenAPIMiddleware, self).process_request(
-            openapi_req)
+        req_result = super().process_request(openapi_req)
         if req_result.errors:
             return self._handle_request_errors(req, resp, req_result)
         req.openapi = req_result
 
     def process_response(self, req, resp, resource, req_succeeded):
         openapi_req = self._get_openapi_request(req)
         openapi_resp = self._get_openapi_response(resp)
-        resp_result = super(FalconOpenAPIMiddleware, self).process_response(
-            openapi_req, openapi_resp)
+        resp_result = super().process_response(openapi_req, openapi_resp)
         if resp_result.errors:
             return self._handle_response_errors(req, resp, resp_result)
 

openapi_core/contrib/falcon/requests.py

@@ -31,7 +31,7 @@ def create(cls, request, default_when_empty={}):
         if request.content_type:
             mimetype = request.content_type.partition(";")[0]
 
-        query = ImmutableMultiDict(request.params.items())
+        query = ImmutableMultiDict(list(request.params.items()))
         parameters = RequestParameters(
             query=query,
             header=request.headers,

openapi_core/contrib/falcon/responses.py

@@ -3,7 +3,7 @@
 from openapi_core.validation.response.datatypes import OpenAPIResponse
 
 
-class FalconOpenAPIResponseFactory(object):
+class FalconOpenAPIResponseFactory:
     @classmethod
     def create(cls, response):
         status_code = int(response.status[:3])

openapi_core/contrib/flask/decorators.py

@@ -19,7 +19,7 @@ def __init__(
             request_provider=FlaskRequestProvider,
             openapi_errors_handler=FlaskOpenAPIErrorsHandler,
     ):
-        super(FlaskOpenAPIViewDecorator, self).__init__(
+        super().__init__(
             request_validator, response_validator,
             request_factory, response_factory,
             request_provider, openapi_errors_handler,
@@ -28,7 +28,7 @@ def __init__(
     def _handle_request_view(self, request_result, view, *args, **kwargs):
         request = self._get_request(*args, **kwargs)
         request.openapi = request_result
-        return super(FlaskOpenAPIViewDecorator, self)._handle_request_view(
+        return super()._handle_request_view(
             request_result, view, *args, **kwargs)
 
     @classmethod

openapi_core/contrib/flask/handlers.py

@@ -8,7 +8,7 @@
 )
 
 
-class FlaskOpenAPIErrorsHandler(object):
+class FlaskOpenAPIErrorsHandler:
 
     OPENAPI_ERROR_STATUS = {
         ServerNotFound: 400,

openapi_core/contrib/flask/providers.py

@@ -2,7 +2,7 @@
 from flask.globals import request
 
 
-class FlaskRequestProvider(object):
+class FlaskRequestProvider:
 
     @classmethod
     def provide(self, *args, **kwargs):

openapi_core/contrib/flask/requests.py

@@ -11,7 +11,7 @@
 PATH_PARAMETER_PATTERN = r'<(?:(?:string|int|float|path|uuid):)?(\w+)>'
 
 
-class FlaskOpenAPIRequestFactory(object):
+class FlaskOpenAPIRequestFactory:
 
     path_regex = re.compile(PATH_PARAMETER_PATTERN)
 

openapi_core/contrib/flask/responses.py

@@ -2,7 +2,7 @@
 from openapi_core.validation.response.datatypes import OpenAPIResponse
 
 
-class FlaskOpenAPIResponseFactory(object):
+class FlaskOpenAPIResponseFactory:
 
     @classmethod
     def create(cls, response):

openapi_core/contrib/flask/views.py

@@ -13,7 +13,7 @@ class FlaskOpenAPIView(MethodView):
     openapi_errors_handler = FlaskOpenAPIErrorsHandler
 
     def __init__(self, spec):
-        super(FlaskOpenAPIView, self).__init__()
+        super().__init__()
         self.request_validator = RequestValidator(spec)
         self.response_validator = ResponseValidator(spec)
 
@@ -23,5 +23,4 @@ def dispatch_request(self, *args, **kwargs):
             response_validator=self.response_validator,
             openapi_errors_handler=self.openapi_errors_handler,
         )
-        return decorator(super(FlaskOpenAPIView, self).dispatch_request)(
-            *args, **kwargs)
+        return decorator(super().dispatch_request)(*args, **kwargs)

openapi_core/contrib/requests/requests.py

@@ -1,5 +1,5 @@
 """OpenAPI core contrib requests requests module"""
-from __future__ import absolute_import
+
 from urllib.parse import urlparse, parse_qs
 
 from werkzeug.datastructures import ImmutableMultiDict
@@ -10,7 +10,7 @@
 )
 
 
-class RequestsOpenAPIRequestFactory(object):
+class RequestsOpenAPIRequestFactory:
 
     @classmethod
     def create(cls, request):

openapi_core/contrib/requests/responses.py

@@ -2,7 +2,7 @@
 from openapi_core.validation.response.datatypes import OpenAPIResponse
 
 
-class RequestsOpenAPIResponseFactory(object):
+class RequestsOpenAPIResponseFactory:
 
     @classmethod
     def create(cls, response):

openapi_core/deserializing/media_types/deserializers.py

@@ -1,7 +1,7 @@
 from openapi_core.deserializing.exceptions import DeserializeError
 
 
-class PrimitiveDeserializer(object):
+class PrimitiveDeserializer:
 
     def __init__(self, mimetype, deserializer_callable):
         self.mimetype = mimetype

openapi_core/deserializing/media_types/factories.py

@@ -9,7 +9,7 @@
 )
 
 
-class MediaTypeDeserializersFactory(object):
+class MediaTypeDeserializersFactory:
 
     MEDIA_TYPE_DESERIALIZERS = {
         'application/json': loads,

openapi_core/deserializing/parameters/deserializers.py

@@ -7,7 +7,7 @@
 from openapi_core.schema.parameters import get_aslist, get_explode, get_style
 
 
-class PrimitiveDeserializer(object):
+class PrimitiveDeserializer:
 
     def __init__(self, param_or_header, deserializer_callable):
         self.param_or_header = param_or_header

openapi_core/deserializing/parameters/factories.py

@@ -4,7 +4,7 @@
 from openapi_core.schema.parameters import get_style
 
 
-class ParameterDeserializersFactory(object):
+class ParameterDeserializersFactory:
 
     PARAMETER_STYLE_DESERIALIZERS = {
         'form': lambda x: x.split(','),

openapi_core/extensions/models/factories.py

@@ -2,15 +2,15 @@
 from openapi_core.extensions.models.models import Model
 
 
-class ModelClassFactory(object):
+class ModelClassFactory:
 
     base_class = Model
 
     def create(self, name):
         return type(name, (self.base_class, ), {})
 
 
-class ModelFactory(object):
+class ModelFactory:
 
     def __init__(self, model_class_factory=None):
         self.model_class_factory = model_class_factory or ModelClassFactory()

openapi_core/extensions/models/models.py

@@ -1,7 +1,7 @@
 """OpenAPI X-Model extension models module"""
 
 
-class BaseModel(object):
+class BaseModel:
     """Base class for OpenAPI X-Model."""
 
     @property

openapi_core/schema/parameters.py

@@ -1,4 +1,3 @@
-from __future__ import division
 from itertools import chain
 
 

openapi_core/schema/schemas.py

@@ -1,9 +1,6 @@
-from __future__ import division
-
-
 def get_all_properties(schema):
     properties = schema.get('properties', {})
-    properties_dict = dict(properties.items())
+    properties_dict = dict(list(properties.items()))
 
     if 'allOf'not in schema:
         return properties_dict

openapi_core/schema/servers.py

@@ -1,6 +1,3 @@
-from __future__ import division
-
-
 def is_absolute(url):
     return url.startswith('//') or '://' in url
 
@@ -11,7 +8,7 @@ def get_server_default_variables(server):
 
     defaults = {}
     variables = server / 'variables'
-    for name, variable in variables.items():
+    for name, variable in list(variables.items()):
         defaults[name] = variable['default']
     return defaults
 

openapi_core/schema/specs.py

@@ -1,5 +1,3 @@
-from __future__ import division
-
 from openapi_core.schema.servers import get_server_url
 
 

openapi_core/security/factories.py

@@ -3,7 +3,7 @@
 )
 
 
-class SecurityProviderFactory(object):
+class SecurityProviderFactory:
 
     PROVIDERS = {
         'apiKey': ApiKeyProvider,

openapi_core/security/providers.py

@@ -3,7 +3,7 @@
 from openapi_core.security.exceptions import SecurityError
 
 
-class BaseProvider(object):
+class BaseProvider:
 
     def __init__(self, scheme):
         self.scheme = scheme

openapi_core/spec/accessors.py

@@ -6,7 +6,7 @@
 class SpecAccessor(DictOrListAccessor):
 
     def __init__(self, dict_or_list, dereferencer):
-        super(SpecAccessor, self).__init__(dict_or_list)
+        super().__init__(dict_or_list)
         self.dereferencer = dereferencer
 
     @contextmanager

openapi_core/templating/datatypes.py

@@ -2,7 +2,7 @@
 
 
 @attr.s
-class TemplateResult(object):
+class TemplateResult:
     pattern = attr.ib(default=None)
     variables = attr.ib(default=None)
 

openapi_core/templating/media_types/finders.py

@@ -1,11 +1,10 @@
 """OpenAPI core templating media types finders module"""
-from __future__ import division
 import fnmatch
 
 from openapi_core.templating.media_types.exceptions import MediaTypeNotFound
 
 
-class MediaTypeFinder(object):
+class MediaTypeFinder:
 
     def __init__(self, content):
         self.content = content