8000 Release v3.0 by jacebrowning · Pull Request #135 · flask-api/flask-api · GitHub
[go: up one dir, main page]

Skip to content

Release v3.0 #135

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.

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

Merged
merged 11 commits into from
Jun 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
global:
- RANDOM_SEED=0
matrix:
- FLASK_VERSION=1.1.1
- FLASK_VERSION=2.0.1

before_install:
- pip install pipenv
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ endif
.PHONY: test
test: install ## Run unit and integration tests
$(NOSE) $(PACKAGE) $(NOSE_OPTIONS)
$(COVERAGESPACE) $(REPOSITORY) overall
$(COVERAGESPACE) update overall

.PHONY: read-coverage
read-coverage:
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ flake8 = "~=3.7.9"
nose = "*"

# Reports
coveragespace = "*"
coveragespace = "~=4.1"

# Documentation
mkdocs = "~=0.17.2"
Expand Down
502 changes: 219 additions & 283 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion flask_api/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from flask_api.app import FlaskAPI

__version__ = '3.0'
__version__ = '3.0.post1'
4 changes: 2 additions & 2 deletions flask_api/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ class FlaskAPI(Flask):
response_class = APIResponse

def __init__(self, *args, **kwargs):
super(FlaskAPI, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.api_settings = APISettings(self.config)
self.register_blueprint(api_resources)
self.jinja_env.filters['urlize_quoted_links'] = urlize_quoted_links

def preprocess_request(self):
request.parser_classes = self.api_settings.DEFAULT_PARSERS
request.renderer_classes = self.api_settings.DEFAULT_RENDERERS
return super(FlaskAPI, self).preprocess_request()
return super().preprocess_request()

def make_response(self, rv):
"""
Expand Down
9 changes: 7 additions & 2 deletions flask_api/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ def method(self):
self._perform_method_overloading()
return self._method

@method.setter
def method(self, value):
self._method = value

@property
def content_type(self):
if not hasattr(self, '_content_type'):
Expand Down Expand Up @@ -138,8 +142,9 @@ def _perform_method_overloading(self):
Also provides support for browser non-form requests (eg JSON),
by specifing '_content' and '_content_type' form fields.
"""
self._method = super(APIRequest, self).method
self._stream = super(APIRequest, self).stream
if not hasattr(self, '_method'):
self.method = super().method
self._stream = super().stream
self._content_type = self.headers.get('Content-Type')
self._content_length = get_content_length(self.environ)

Expand Down
2 changes: 1 addition & 1 deletion flask_api/response.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class APIResponse(Response):
api_return_types = (list, dict)

def __init__(self, content=None, *args, **kwargs):
super(APIResponse, self).__init__(None, *args, **kwargs)
super().__init__(None, *args, **kwargs)

media_type = None
if isinstance(content, self.api_return_types) or content == '':
Expand Down
4 changes: 1 addition & 3 deletions flask_api/tests/test_parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ def test_invalid_multipart(self):
media_type = mediatypes.MediaType('multipart/form-data; boundary="foo"')
with self.assertRaises(exceptions.ParseError) as context:
parser.parse(stream, media_type, content_length=len('invalid'))
detail = str(context.exception)
expected = 'Multipart parse error - Expected boundary at start of multipart data'
self.assertEqual(detail, expected)
self.assertIn('Multipart parse error', str(context.exception))

def test_invalid_multipart_no_boundary(self):
parser = parsers.MultiPartParser()
Expand Down
2 changes: 1 addition & 1 deletion flask_api/tests/test_renderers.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class CustomJsonEncoder(JSONEncoder):
def default(self, o):
if isinstance(o, datetime):
return o.isoformat()
return super(CustomJsonEncoder, self).default(o)
return super().default(o)

app = self._make_app()
app.json_encoder = CustomJsonEncoder
Expand Down
0