Remove Flask references (spec-first#434)

rokroskar · Apr 5, 2017 · a95b986 · a95b986
1 parent 067ad1b
commit a95b986
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/connexion/decorators/decorator.py b/connexion/decorators/decorator.py
@@ -48,7 +48,7 @@ def wrapper(request):
 class EndOfRequestLifecycleDecorator(BaseDecorator):
     """Manages the lifecycle of the request internally in Connexion.
     Filter the ConnexionRequest instance to return the corresponding
-    flask.Response object.
+    framework specific object.
     """
 
     def __init__(self, api, mimetype):

diff --git a/connexion/decorators/validation.py b/connexion/decorators/validation.py
@@ -106,8 +106,8 @@ def wrapper(request):
             if all_json(self.consumes):
                 data = request.json
 
-                # flask does not process json if the Content-Type header is not equal to "application/json"
                 if data is None and len(request.body) > 0 and not self.is_null_value_valid:
+                    # the body has contents that were not parsed as JSON
                     return problem(415,
                                    "Unsupported Media Type",
                                    "Invalid Content-type ({content_type}), expected JSON data".format(
@@ -125,10 +125,7 @@ def wrapper(request):
         return wrapper
 
     def validate_schema(self, data, url):
-        """
-        :type data: dict
-        :rtype: flask.Response | None
-        """
+        # type: (dict, AnyStr) -> Union[ConnexionResponse, None]
         if self.is_null_value_valid and is_null(data):
             return None
 
@@ -154,10 +151,7 @@ def __init__(self, schema, validator=None):
         self.validator = ValidatorClass(schema, format_checker=draft4_format_checker)
 
     def validate_schema(self, data, url):
-        """
-        :type data: dict
-        :rtype: flask.Response | None
-        """
+        # type: (dict, AnyStr) -> Union[ConnexionResponse, None]
         try:
             self.validator.validate(data)
         except ValidationError as exception:

diff --git a/connexion/operation.py b/connexion/operation.py
@@ -104,7 +104,7 @@ def get_mimetype(self):
     def _request_begin_lifecycle_decorator(self):
         """
         Transforms the result of the operation handler in a internal
-        representation (connexion.decorators.ConnexionRequest) to be
+        representation (connexion.request.ConnexionRequest) to be
         used by internal Connexion decorators.
 
         :rtype: types.FunctionType
@@ -116,7 +116,7 @@ def _request_end_lifecycle_decorator(self):
         """
         Guarantees that instead of the internal representation of the
         operation handler response
-        (connexion.decorators.ConnexionRequest) a flask.Response
+        (connexion.request.ConnexionRequest) a framework specific
         object is returned.
         :rtype: types.FunctionType
         """

diff --git a/connexion/problem.py b/connexion/problem.py
@@ -24,8 +24,8 @@ def problem(status, title, detail, type=None, instance=None, headers=None, ext=N
     :type headers: dict | None
     :param ext: Extension members to include in the body
     :type ext: dict | None
-    :return: Json serialized error response
-    :rtype: flask.Response
+    :return: error response
+    :rtype: ConnexionResponse
     """
     if not type:
         type = 'about:blank'
@@ -36,11 +36,6 @@ def problem(status, title, detail, type=None, instance=None, headers=None, ext=N
     if ext:
         problem_response.update(ext)
 
-    # We serialize here because even if the default content type is
-    # not set to JSON, which means that the
-    # `decorators.produces.Jsonifier` will not be added to the request
-    # life-cycle (so we cannot rely on that serialization), we will
-    # return a problem payload in JSON format.
     mimetype = content_type = 'application/problem+json'
     return ConnexionResponse(status, mimetype, content_type,
                              body=problem_response,