Remove six (Python 2 support) (#1102)

* remove some six uses (Py2)

* remove more six usages

* no need for "object" in Py3

* remove remaining six uses

Author: hjacobs

connexion/__init__.py

@@ -15,36 +15,34 @@
 sys.modules[full_name] = sys.modules[compat.__name__]
 
 
-def not_installed_error():  # pragma: no cover
-    import six
+def not_installed_error(exc):  # pragma: no cover
     import functools
 
-    def _required_lib(exec_info, *args, **kwargs):
-        six.reraise(*exec_info)
+    def _required_lib(exc, *args, **kwargs):
+        raise exc
 
-    return functools.partial(_required_lib, sys.exc_info())
+    return functools.partial(_required_lib, exc)
 
 
 try:
     from .apis.flask_api import FlaskApi, context  # NOQA
     from .apps.flask_app import FlaskApp
     from flask import request  # NOQA
-except ImportError:  # pragma: no cover
-    _flask_not_installed_error = not_installed_error()
+except ImportError as e:  # pragma: no cover
+    _flask_not_installed_error = not_installed_error(e)
     FlaskApi = _flask_not_installed_error
     FlaskApp = _flask_not_installed_error
 
 App = FlaskApp
 Api = FlaskApi
 
-if sys.version_info[0] >= 3:  # pragma: no cover
-    try:
-        from .apis.aiohttp_api import AioHttpApi
-        from .apps.aiohttp_app import AioHttpApp
-    except ImportError:  # pragma: no cover
-        _aiohttp_not_installed_error = not_installed_error()
-        AioHttpApi = _aiohttp_not_installed_error
-        AioHttpApp = _aiohttp_not_installed_error
+try:
+    from .apis.aiohttp_api import AioHttpApi
+    from .apps.aiohttp_app import AioHttpApp
+except ImportError as e:  # pragma: no cover
+    _aiohttp_not_installed_error = not_installed_error(e)
+    AioHttpApi = _aiohttp_not_installed_error
+    AioHttpApp = _aiohttp_not_installed_error
 
 # This version is replaced during release process.
 __version__ = '2018.0.dev1'

connexion/apis/abstract.py

@@ -5,8 +5,6 @@
 import warnings
 from enum import Enum
 
-import six
-
 from ..decorators.produces import NoContent
 from ..exceptions import ResolverError
 from ..http_facts import METHODS
@@ -31,8 +29,7 @@ def __init__(cls, name, bases, attrs):
         cls._set_jsonifier()
 
 
-@six.add_metaclass(AbstractAPIMeta)
-class AbstractAPI(object):
+class AbstractAPI(metaclass=AbstractAPIMeta):
     """
     Defines an abstract interface for a Swagger API
     """
@@ -230,7 +227,8 @@ def _handle_add_operation_error(self, path, method, exc_info):
             logger.exception(error_msg)
         else:
             logger.error(error_msg)
-            six.reraise(*exc_info)
+            _type, value, traceback = exc_info
+            raise value.with_traceback(traceback)
 
     @classmethod
     @abc.abstractmethod

connexion/apis/flask_api.py

@@ -2,7 +2,6 @@
 import warnings
 
 import flask
-import six
 import werkzeug.exceptions
 from connexion.apis import flask_utils
 from connexion.apis.abstract import AbstractAPI
@@ -182,7 +181,7 @@ def _build_response(cls, mimetype, content_type=None, headers=None, status_code=
             'response': data,
             'status': status_code
         }
-        kwargs = {k: v for k, v in six.iteritems(kwargs) if v is not None}
+        kwargs = {k: v for k, v in kwargs.items() if v is not None}
         return flask.current_app.response_class(**kwargs)  # type: flask.Response
 
     @classmethod

connexion/apps/abstract.py

@@ -2,16 +2,13 @@
 import logging
 import pathlib
 
-import six
-
 from ..options import ConnexionOptions
 from ..resolver import Resolver
 
 logger = logging.getLogger('connexion.app')
 
 
-@six.add_metaclass(abc.ABCMeta)
-class AbstractApp(object):
+class AbstractApp(metaclass=abc.ABCMeta):
     def __init__(self, import_name, api_cls, port=None, specification_dir='',
                  host=None, server=None, arguments=None, auth_all_paths=False, debug=None,
                  resolver=None, options=None, skip_error_handlers=False):

connexion/decorators/parameter.py

@@ -4,7 +4,6 @@
 import re
 
 import inflection
-import six
 
 from ..http_facts import FORM_CONTENT_TYPES
 from ..lifecycle import ConnexionRequest  # NOQA
@@ -33,15 +32,11 @@ def inspect_function_arguments(function):  # pragma: no cover
     :type function: Callable
     :rtype: tuple[list[str], bool]
     """
-    if six.PY3:
-        parameters = inspect.signature(function).parameters
-        bound_arguments = [name for name, p in parameters.items()
-                           if p.kind not in (p.VAR_POSITIONAL, p.VAR_KEYWORD)]
-        has_kwargs = any(p.kind == p.VAR_KEYWORD for p in parameters.values())
-        return list(bound_arguments), has_kwargs
-    else:
-        argspec = inspect.getargspec(function)
-        return argspec.args, bool(argspec.keywords)
+    parameters = inspect.signature(function).parameters
+    bound_arguments = [name for name, p in parameters.items()
+                        if p.kind not in (p.VAR_POSITIONAL, p.VAR_KEYWORD)]
+    has_kwargs = any(p.kind == p.VAR_KEYWORD for p in parameters.values())
+    return list(bound_arguments), has_kwargs
 
 
 def snake_and_shadow(name):

connexion/decorators/security.py

@@ -7,7 +7,7 @@
 
 import requests
 from connexion.utils import get_function_from_name
-from six.moves import http_cookies
+import http.cookies
 
 from ..exceptions import (ConnexionException, OAuthProblem,
                           OAuthResponseProblem, OAuthScopeProblem)
@@ -240,7 +240,7 @@ def get_cookie_value(cookies, name):
     :param cookies: str: cookies raw data
     :param name: str: cookies key
     '''
-    cookie_parser = http_cookies.SimpleCookie()
+    cookie_parser = http.cookies.SimpleCookie()
     cookie_parser.load(str(cookies))
     try:
         return cookie_parser[name].value

connexion/decorators/uri_parsing.py

@@ -6,8 +6,6 @@
 import json
 from .. import utils
 
-import six
-
 from ..utils import create_empty_dict_from_list
 from .decorator import BaseDecorator
 
@@ -21,8 +19,7 @@
 }
 
 
-@six.add_metaclass(abc.ABCMeta)
-class AbstractURIParser(BaseDecorator):
+class AbstractURIParser(BaseDecorator, metaclass=abc.ABCMeta):
     parsable_parameters = ["query", "path"]
 
     def __init__(self, param_defns, body_defn):

connexion/decorators/validation.py

@@ -5,7 +5,6 @@
 import sys
 
 import pkg_resources
-import six
 from jsonschema import Draft4Validator, ValidationError, draft4_format_checker
 from jsonschema.validators import extend
 from werkzeug.datastructures import FileStorage
@@ -230,7 +229,7 @@ def validate_schema(self, data, url):
             logger.error("{url} validation error: {error}".format(url=url,
                                                                   error=exception),
                          extra={'validator': 'response'})
-            six.reraise(*sys.exc_info())
+            raise exception
 
         return None
 

connexion/jsonifier.py

@@ -2,8 +2,6 @@
 import json
 import uuid
 
-import six
-
 
 class JSONEncoder(json.JSONEncoder):
     def default(self, o):
@@ -41,7 +39,7 @@ def dumps(self, data, **kwargs):
         """ Central point where JSON serialization happens inside
         Connexion.
         """
-        for k, v in six.iteritems(self.dumps_args):
+        for k, v in self.dumps_args.items():
             kwargs.setdefault(k, v)
         return self.json.dumps(data, **kwargs) + '\n'
 

connexion/operations/abstract.py

@@ -1,7 +1,6 @@
 import abc
 import logging
 
-import six
 from connexion.operations.secure import SecureOperation
 
 from ..decorators.metrics import UWSGIMetricsCollector
@@ -22,8 +21,7 @@
 }
 
 
-@six.add_metaclass(abc.ABCMeta)
-class AbstractOperation(SecureOperation):
+class AbstractOperation(SecureOperation, metaclass=abc.ABCMeta):
 
     """
     An API routes requests to an Operation by a (path, method) pair.