Skip to content

Commit 44de8e5

Browse files
authored
Merge branch 'master' into fix-integer-index
2 parents 8f674e0 + a59b634 commit 44de8e5

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ With Flask-RESTX, you only import the api instance to route and document your en
7575
ns = api.namespace('todos', description='TODO operations')
7676
7777
todo = api.model('Todo', {
78-
'id': fields.Integer(readOnly=True, description='The task unique identifier'),
78+
'id': fields.Integer(readonly=True, description='The task unique identifier'),
7979
'task': fields.String(required=True, description='The task details')
8080
})
8181

doc/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ The development version can be downloaded from
2020
pip install -e .[dev,test]
2121
2222
23-
Flask-RESTX requires Python version 2.7, 3.3, 3.4 or 3.5.
23+
Flask-RESTX requires Python version 2.7, 3.5, 3.6, 3.7, or 3.8.
2424
It's also working with PyPy and PyPy3.

doc/quickstart.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ using a library similar to :mod:`python:argparse`.
249249
Unlike the :mod:`python:argparse` module, :meth:`~reqparse.RequestParser.parse_args`
250250
returns a Python dictionary instead of a custom data structure.
251251
252-
Using the :class:`~reqparse.RequestParser` class also gives you sane error messages for free.
252+
Using the :class:`~reqparse.RequestParser` class also gives you same error messages for free.
253253
If an argument fails to pass validation,
254254
Flask-RESTX will respond with a 400 Bad Request and a response highlighting the error.
255255

flask_restx/api.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ def __init__(
144144
self._default_error_handler = None
145145
self.tags = tags or []
146146

147-
self.error_handlers = {
147+
self.error_handlers = OrderedDict({
148148
ParseError: mask_parse_error_handler,
149149
MaskError: mask_error_handler,
150-
}
150+
})
151151
self._schema = None
152152
self.models = {}
153153
self._refresolver = None
@@ -559,7 +559,7 @@ def __schema__(self):
559559

560560
@property
561561
def _own_and_child_error_handlers(self):
562-
rv = {}
562+
rv = OrderedDict()
563563
rv.update(self.error_handlers)
564564
for ns in self.namespaces:
565565
for exception, handler in six.iteritems(ns.error_handlers):

flask_restx/namespace.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import inspect
55
import warnings
66
import logging
7-
from collections import namedtuple
7+
from collections import namedtuple, OrderedDict
88

99
import six
1010
from flask import request
@@ -57,7 +57,7 @@ def __init__(
5757
self.urls = {}
5858
self.decorators = decorators if decorators else []
5959
self.resources = [] # List[ResourceRoute]
60-
self.error_handlers = {}
60+
self.error_handlers = OrderedDict()
6161
self.default_error_handler = None
6262
self.authorizations = authorizations
6363
self.ordered = ordered

0 commit comments

Comments
 (0)