8000 Merge pull request #135 from flask-api/release/v3.0 · flask-api/flask-api@fb43168 · GitHub
[go: up one dir, main page]
Skip to content

Commit fb43168

Browse files
jacebrowningjacebrowning
authored
Merge pull request #135 from flask-api/release/v3.0
Release v3.0
2 parents 397989f + 616df79 commit fb43168

File tree

10 files changed

+235
-296
lines changed

10 files changed

+235
-296
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
global:
1616
- RANDOM_SEED=0
1717
matrix:
18-
- FLASK_VERSION=1.1.1
18+
- FLASK_VERSION=2.0.1
1919

2020
before_install:
2121
- pip install pipenv

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ endif
7070
.PHONY: test
7171
test: install ## Run unit and integration tests
7272
$(NOSE) $(PACKAGE) $(NOSE_OPTIONS)
73-
$(COVERAGESPACE) $(REPOSITORY) overall
73+
$(COVERAGESPACE) update overall
7474

7575
.PHONY: read-coverage
7676
read-coverage:

‎Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ flake8 = "~=3.7.9"
1818
nose = "*"
1919

2020
# Reports
21-
coveragespace = "*"
21+
coveragespace = "~=4.1"
2222

2323
# Documentation
2424
mkdocs = "~=0.17.2"

‎Pipfile.lock

Lines changed: 219 additions & 283 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flask_api/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
from flask_api.app import FlaskAPI
22

3-
__version__ = '3.0'
3+
__version__ = '3.0.post1'

‎flask_api/app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ class FlaskAPI(Flask):
2929
response_class = APIResponse
3030

3131
def __init__(self, *args, **kwargs):
32-
super(FlaskAPI, self).__init__(*args, **kwargs)
32+
super().__init__(*args, **kwargs)
3333
self.api_settings = APISettings(self.config)
3434
self.register_blueprint(api_resources)
3535
self.jinja_env.filters['urlize_quoted_links'] = urlize_quoted_links
3636

3737
def preprocess_request(self):
3838
request.parser_classes = self.api_settings.DEFAULT_PARSERS
3939
request.renderer_classes = self.api_settings.DEFAULT_RENDERERS
40-
return super(FlaskAPI, self).preprocess_request()
40+
return super().preprocess_request()
4141

4242
def make_response(self, rv):
4343
"""

‎flask_api/request.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ def method(self):
110110
self._perform_method_overloading()
111111
return self._method
112112

113+
@method.setter
114+
def method(self, value):
115+
self._method = value
116+
113117
@property
114118
def content_type(self):
115119
if not hasattr(self, '_content_type'):
@@ -138,8 +142,9 @@ def _perform_method_overloading(self):
138142
Also provides support for browser non-form requests (eg JSON),
139143
by specifing '_content' and '_content_type' form fields.
140144
"""
141-
self._method = super(APIRequest, self).method
142-
self._stream = super(APIRequest, self).stream
145+
if not hasattr(self, '_method'):
146+
self.method = super().method
147+
self._stream = super().stream
143148
self._content_type = self.headers.get('Content-Type')
144149
self._content_length = get_content_length(self.environ)
145150

‎flask_api/response.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class APIResponse(Response):
88
api_return_types = (list, dict)
99

1010
def __init__(self, content=None, *args, **kwargs):
11-
super(APIResponse, self).__init__(None, *args, **kwargs)
11+
super().__init__(None, *args, **kwargs)
1212

1313
media_type = None
1414
if isinstance(content, self.api_return_types) or content == '':

‎flask_api/tests/test_parsers.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ def test_invalid_multipart(self):
4646
media_type = mediatypes.MediaType('multipart/form-data; boundary="foo"')
4747
with self.assertRaises(exceptions.ParseError) as context:
4848
parser.parse(stream, media_type, content_length=len('invalid'))
49-
detail = str(context.exception)
50-
expected = 'Multipart parse error - Expected boundary at start of multipart data'
51-
self.assertEqual(detail, expected)
49+
self.assertIn('Multipart parse error', str(context.exception))
5250

5351
def test_invalid_multipart_no_boundary(self):
5452
parser = parsers.MultiPartParser()

‎flask_api/tests/test_renderers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class CustomJsonEncoder(JSONEncoder):
3939
def default(self, o):
4040
if isinstance(o, datetime):
4141
return o.isoformat()
42-
return super(CustomJsonEncoder, self).default(o)
42+
return super().default(o)
4343

4444
app = self._make_app()
4545
app.json_encoder = CustomJsonEncoder

0 commit comments

Comments
 (0)
0