Skip to content

Commit ceea430

Browse files
authored
Merge branch 'master' into fix-multiple-docs-for-one-endpoint
2 parents c726306 + 9cd2cf8 commit ceea430

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
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

flask_restx/api.py

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

149-
self.error_handlers = {
149+
self.error_handlers = OrderedDict({
150150
ParseError: mask_parse_error_handler,
151151
MaskError: mask_error_handler,
152-
}
152+
})
153153
self._schema = None
154154
self.models = {}
155155
self._refresolver = None
@@ -562,7 +562,7 @@ def __schema__(self):
562562

563563
@property
564564
def _own_and_child_error_handlers(self):
565-
rv = {}
565+
rv = OrderedDict()
566566
rv.update(self.error_handlers)
567567
for ns in self.namespaces:
568568
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)