Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add changes so I can use reqparse and parameters at the same time #28

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add changes so I can use reqparse and parameters at the same time #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eefbb3
add changes so I can use reqparse and parameters at the same time
Menda0 Jul 24, 2018
841f907
Merge branch 'master' into master
Menda0 Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
18 changes: 9 additions & 9 deletions flask_restful_swagger_2/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
from flask_restful import (Api as restful_Api, abort as flask_abort,
Resource as flask_Resource)

from flask_restful_swagger_2.swagger import (ValidationError, create_swagger_endpoint,
add_parameters, validate_path_item_object,
validate_operation_object,
validate_definitions_object,
extract_swagger_path, parse_method_doc,
parse_schema_doc, _auth as auth)
from betacode_flask_restful_swagger_2.swagger import (ValidationError, create_swagger_endpoint,
add_parameters, validate_path_item_object,
validate_operation_object,
validate_definitions_object,
extract_swagger_path, parse_method_doc,
parse_schema_doc, _auth as auth)


# python3 compatibility
Expand Down Expand Up @@ -213,8 +213,8 @@ def _extract(self):
return self._extract_with_reqparser(self._operation)

def _extract_with_reqparser(self, operation):
if 'parameters' in operation:
raise ValidationError('parameters and reqparser can\'t be in same spec')
# if 'parameters' in operation:
# raise ValidationError('parameters and reqparser can\'t be in same spec')
# we need to pass copy because 'reqparser' will be deleted
operation = self._get_reqparse_args(operation.copy())
return self._extract_schemas(operation)
Expand Down Expand Up @@ -255,7 +255,7 @@ def _get_reqparse_args(self, operation):
'schema': model,
'required': model.is_required()
})
operation['parameters'] = params
operation['parameters'] = operation['parameters'] + params
return operation

@staticmethod
Expand Down