properly remove six dependency (closes #482)

Author: ziirish

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "pypy3"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3"]
     steps:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1

CHANGELOG.rst

@@ -25,6 +25,18 @@ Releases prior to 0.3.0 were “best effort” filled out, but are missing
 some info. If you see your contribution missing info, please open a PR
 on the Changelog!
 
+.. _section-1.0.2:
+1.0.2
+-----
+
+.. _bug_fixes-1.0.2
+Bug Fixes
+~~~~~~~~~
+
+::
+
+   * Properly remove six dependency
+
 .. _section-1.0.1:
 1.0.1
 -----

flask_restx/postman.py

@@ -1,16 +1,13 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
-
 from time import time
 from uuid import uuid5, NAMESPACE_URL
 
-from six import iteritems
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
 
 
 def clean(data):
     """Remove all keys where value is None"""
-    return dict((k, v) for k, v in iteritems(data) if v is not None)
+    return dict((k, v) for k, v in data.items() if v is not None)
 
 
 DEFAULT_VARS = {
@@ -56,15 +53,15 @@ def headers(self):
 
         # Add security headers if needed (global then local)
         for security in self.collection.api.__schema__.get("security", []):
-            for key, header in iteritems(self.collection.apikeys):
+            for key, header in self.collection.apikeys.items():
                 if key in security:
                     headers[header] = ""
         for security in self.operation.get("security", []):
-            for key, header in iteritems(self.collection.apikeys):
+            for key, header in self.collection.apikeys.items():
                 if key in security:
                     headers[header] = ""
 
-        lines = [":".join(line) for line in iteritems(headers)]
+        lines = [":".join(line) for line in headers.items()]
         return "\n".join(lines)
 
     @property
@@ -103,7 +100,7 @@ def process_url(self, urlvars=False):
         )
         if not params:
             return url, None
-        for name, param in iteritems(params):
+        for name, param in params.items():
             if param["in"] == "path":
                 url = url.replace("{%s}" % name, ":%s" % name)
                 path_vars[name] = DEFAULT_VARS.get(param["type"], "")
@@ -171,10 +168,10 @@ def requests(self):
                 },
             )
         # Then iter over API paths and methods
-        for path, operations in iteritems(self.api.__schema__["paths"]):
+        for path, operations in self.api.__schema__["paths"].items():
             path_params = operations.get("parameters", [])
 
-            for method, operation in iteritems(operations):
+            for method, operation in operations.items():
                 if method != "parameters":
                     yield Request(self, path, path_params, method, operation)
 
@@ -187,9 +184,7 @@ def folders(self):
     def apikeys(self):
         return dict(
             (name, secdef["name"])
-            for name, secdef in iteritems(
-                self.api.__schema__.get("securityDefinitions")
-            )
+            for name, secdef in self.api.__schema__.get("securityDefinitions").items()
             if secdef.get("in") == "header" and secdef.get("type") == "apiKey"
         )
 

flask_restx/swagger.py

@@ -1,18 +1,11 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, absolute_import
-
 import itertools
 import re
 
 from inspect import isclass, getdoc
 from collections import OrderedDict
 
-try:
-    from collections.abc import Hashable
-except ImportError:
-    # TODO Remove this to drop Python2 support
-    from collections import Hashable
-from six import string_types, itervalues, iteritems, iterkeys
+from collections.abc import Hashable
 
 from flask import current_app
 
@@ -22,10 +15,7 @@
 from .utils import merge, not_none, not_none_sorted
 from ._http import HTTPStatus
 
-try:
-    from urllib.parse import quote
-except ImportError:
-    from urllib import quote
+from urllib.parse import quote
 
 #: Maps Flask/Werkzeug rooting types to Swagger ones
 PATH_TYPES = {
@@ -147,7 +137,7 @@ def _param_to_header(param):
 
 
 def _clean_header(header):
-    if isinstance(header, string_types):
+    if isinstance(header, str):
         header = {"description": header}
     typedef = header.get("type", "string")
     if isinstance(typedef, Hashable) and typedef in PY_TYPES:
@@ -306,7 +296,7 @@ def as_dict(self):
             "basePath": basepath,
             "paths": not_none_sorted(paths),
             "info": infos,
-            "produces": list(iterkeys(self.api.representations)),
+            "produces": list(self.api.representations.keys()),
             "consumes": ["application/json"],
             "securityDefinitions": self.api.authorizations or None,
             "security": self.security_requirements(self.api.security) or None,
@@ -327,7 +317,7 @@ def extract_tags(self, api):
         tags = []
         by_name = {}
         for tag in api.tags:
-            if isinstance(tag, string_types):
+            if isinstance(tag, str):
                 tag = {"name": tag}
             elif isinstance(tag, (list, tuple)):
                 tag = {"name": tag[0], "description": tag[1]}
@@ -389,7 +379,7 @@ def extract_resource_doc(self, resource, url, route_doc=None):
                 method_params = self.expected_params(method_doc)
                 method_params = merge(method_params, method_doc.get("params", {}))
                 inherited_params = OrderedDict(
-                    (k, v) for k, v in iteritems(params) if k in method_params
+                    (k, v) for k, v in params.items() if k in method_params
                 )
                 method_doc["params"] = merge(inherited_params, method_params)
                 for name, param in method_doc["params"].items():
@@ -469,7 +459,7 @@ def expected_params(self, doc):
 
     def register_errors(self):
         responses = {}
-        for exception, handler in iteritems(self.api.error_handlers):
+        for exception, handler in self.api.error_handlers.items():
             doc = parse_docstring(handler)
             response = {"description": doc["summary"]}
             apidoc = getattr(handler, "__apidoc__", {})
@@ -530,7 +520,7 @@ def vendor_fields(self, doc, method):
         """
         return dict(
             (k if k.startswith("x-") else "x-{0}".format(k), v)
-            for k, v in iteritems(doc[method].get("vendor", {}))
+            for k, v in doc[method].get("vendor", {}).items()
         )
 
     def description_for(self, doc, method):
@@ -555,7 +545,7 @@ def operation_id_for(self, doc, method):
 
     def parameters_for(self, doc):
         params = []
-        for name, param in iteritems(doc["params"]):
+        for name, param in doc["params"].items():
             param["name"] = name
             if "type" not in param and "schema" not in param:
                 param["type"] = "string"
@@ -584,7 +574,7 @@ def parameters_for(self, doc):
                 "format": "mask",
                 "description": "An optional fields mask",
             }
-            if isinstance(mask, string_types):
+            if isinstance(mask, str):
                 param["default"] = mask
             params.append(param)
 
@@ -596,9 +586,9 @@ def responses_for(self, doc, method):
 
         for d in doc, doc[method]:
             if "responses" in d:
-                for code, response in iteritems(d["responses"]):
+                for code, response in d["responses"].items():
                     code = str(code)
-                    if isinstance(response, string_types):
+                    if isinstance(response, str):
                         description = response
                         model = None
                         kwargs = {}
@@ -632,8 +622,8 @@ def responses_for(self, doc, method):
                 responses[code]["schema"] = self.serialize_schema(d["model"])
 
             if "docstring" in d:
-                for name, description in iteritems(d["docstring"]["raises"]):
-                    for exception, handler in iteritems(self.api.error_handlers):
+                for name, description in d["docstring"]["raises"].items():
+                    for exception, handler in self.api.error_handlers.items():
                         error_responses = getattr(handler, "__apidoc__", {}).get(
                             "responses", {}
                         )
@@ -658,17 +648,16 @@ def process_headers(self, response, doc, method=None, headers=None):
             response["headers"] = dict(
                 (k, _clean_header(v))
                 for k, v in itertools.chain(
-                    iteritems(doc.get("headers", {})),
-                    iteritems(method_doc.get("headers", {})),
-                    iteritems(headers or {}),
+                    doc.get("headers", {}).items(),
+                    method_doc.get("headers", {}).items(),
+                    (headers or {}).items(),
                 )
             )
         return response
 
     def serialize_definitions(self):
         return dict(
-            (name, model.__schema__)
-            for name, model in iteritems(self._registered_models)
+            (name, model.__schema__) for name, model in self._registered_models.items()
         )
 
     def serialize_schema(self, model):
@@ -683,7 +672,7 @@ def serialize_schema(self, model):
             self.register_model(model)
             return ref(model)
 
-        elif isinstance(model, string_types):
+        elif isinstance(model, str):
             self.register_model(model)
             return ref(model)
 
@@ -710,13 +699,13 @@ def register_model(self, model):
             for parent in specs.__parents__:
                 self.register_model(parent)
         if isinstance(specs, (Model, OrderedModel)):
-            for field in itervalues(specs):
+            for field in specs.values():
                 self.register_field(field)
         return ref(model)
 
     def register_field(self, field):
         if isinstance(field, fields.Polymorph):
-            for model in itervalues(field.mapping):
+            for model in field.mapping.values():
                 self.register_model(model)
         elif isinstance(field, fields.Nested):
             self.register_model(field.nested)
@@ -745,12 +734,12 @@ def security_requirements(self, value):
             return []
 
     def security_requirement(self, value):
-        if isinstance(value, (string_types)):
+        if isinstance(value, (str)):
             return {value: []}
         elif isinstance(value, dict):
             return dict(
                 (k, v if isinstance(v, (list, tuple)) else [v])
-                for k, v in iteritems(value)
+                for k, v in value.items()
             )
         else:
             return None

requirements/develop.pip

@@ -1,2 +1,2 @@
 tox
-black; python_version >= '3.6'
+black

requirements/doc.pip

@@ -1,3 +1,3 @@
 alabaster==0.7.12
-Sphinx==2.1.2
-sphinx-issues==1.2.0
+Sphinx==5.3.0
+sphinx-issues==3.0.1

requirements/install.pip

@@ -1,5 +1,4 @@
-aniso8601==8.0.0; python_version < '3.5'
-aniso8601>=0.82; python_version >= '3.5'
+aniso8601>=0.82
 jsonschema
 Flask>=0.8, !=2.0.0
 werkzeug !=2.0.0

setup.py

@@ -102,10 +102,11 @@ def pip(filename):
         "Topic :: System :: Software Distribution",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "License :: OSI Approved :: BSD License",

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py{37, 38, 39, 310}, pypy3, doc
+envlist = py{37, 38, 39, 310, 311}, pypy3, doc
 
 [testenv]
 commands = {posargs:inv test qa}