Merge pull request #54 from kbevers/fix-ordereddict-import

Avoid DeprecationWarning when importing OrderedDict

Author: SVilgelm

flask_restx/api.py

@@ -10,11 +10,7 @@
 import six
 import sys
 
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    # TODO Remove this to drop Python2 support
-    from collections import OrderedDict
+from collections import OrderedDict
 from functools import wraps, partial
 from types import MethodType
 

flask_restx/marshalling.py

@@ -1,11 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    # TODO Remove this to drop Python2 support
-    from collections import OrderedDict
+from collections import OrderedDict
 from functools import wraps
 from six import iteritems
 

flask_restx/mask.py

@@ -5,11 +5,7 @@
 import re
 import six
 
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    # TODO Remove this to drop Python2 support
-    from collections import OrderedDict
+from collections import OrderedDict
 from inspect import isclass
 
 from .errors import RestError

flask_restx/model.py

@@ -5,11 +5,12 @@
 import re
 import warnings
 
+from collections import OrderedDict
 try:
-    from collections.abc import OrderedDict, MutableMapping
+    from collections.abc import MutableMapping
 except ImportError:
     # TODO Remove this to drop Python2 support
-    from collections import OrderedDict, MutableMapping
+    from collections import MutableMapping
 from six import iteritems, itervalues
 from werkzeug.utils import cached_property
 

flask_restx/swagger.py

@@ -5,11 +5,12 @@
 import re
 
 from inspect import isclass, getdoc
+from collections import OrderedDict
 try:
-    from collections.abc import OrderedDict, Hashable
+    from collections.abc import Hashable
 except ImportError:
     # TODO Remove this to drop Python2 support
-    from collections import OrderedDict, Hashable
+    from collections import Hashable
 from six import string_types, itervalues, iteritems, iterkeys
 
 from flask import current_app

flask_restx/utils.py

@@ -3,11 +3,7 @@
 
 import re
 
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    # TODO Remove this to drop Python2 support
-    from collections import OrderedDict
+from collections import OrderedDict
 from copy import deepcopy
 from six import iteritems
 

tests/test_fields.py

@@ -1,11 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    # TODO Remove this to drop Python2 support
-    from collections import OrderedDict
+from collections import OrderedDict
 from datetime import date, datetime
 from decimal import Decimal
 from functools import partial

tests/test_fields_mask.py

@@ -4,11 +4,7 @@
 import json
 import pytest
 
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    # TODO Remove this to drop Python2 support
-    from collections import OrderedDict
+from collections import OrderedDict
 
 from flask_restx import mask, Api, Resource, fields, marshal, Mask
 

tests/test_marshalling.py

@@ -7,11 +7,7 @@
     marshal, marshal_with, marshal_with_field, fields, Api, Resource
 )
 
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    # TODO Remove this to drop Python2 support
-    from collections import OrderedDict
+from collections import OrderedDict
 
 
 # Add a dummy Resource to verify that the app is properly set.

tests/test_model.py

@@ -4,11 +4,7 @@
 import copy
 import pytest
 
-try:
-    from collections.abc import OrderedDict
-except ImportError:
-    # TODO Remove this to drop Python2 support
-    from collections import OrderedDict
+from collections import OrderedDict
 
 from flask_restx import fields, Model, OrderedModel, SchemaModel