Fix DeprecationWarning when accessing collections.abc classes via collections

rest_framework/compat.py

@@ -12,10 +12,10 @@
 
 try:
     # Python 3
-    from collections.abc import Mapping   # noqa
+    from collections.abc import Mapping, MutableMapping   # noqa
 except ImportError:
     # Python 2.7
-    from collections import Mapping   # noqa
+    from collections import Mapping, MutableMapping   # noqa
 
 try:
     # Python 3

rest_framework/fields.py

@@ -1,6 +1,5 @@
 from __future__ import unicode_literals
 
-import collections
 import copy
 import datetime
 import decimal
@@ -33,7 +32,7 @@
 
 from rest_framework import ISO_8601
 from rest_framework.compat import (
-    MaxLengthValidator, MaxValueValidator, MinLengthValidator,
+    Mapping, MaxLengthValidator, MaxValueValidator, MinLengthValidator,
     MinValueValidator, ProhibitNullCharactersValidator, unicode_repr,
     unicode_to_repr
 )
@@ -96,7 +95,7 @@ def get_attribute(instance, attrs):
     """
     for attr in attrs:
         try:
-            if isinstance(instance, collections.Mapping):
+            if isinstance(instance, Mapping):
                 instance = instance[attr]
             else:
                 instance = getattr(instance, attr)
@@ -1661,7 +1660,7 @@ def to_internal_value(self, data):
         """
         if html.is_html_input(data):
             data = html.parse_html_list(data, default=[])
-        if isinstance(data, type('')) or isinstance(data, collections.Mapping) or not hasattr(data, '__iter__'):
+        if isinstance(data, type('')) or isinstance(data, Mapping) or not hasattr(data, '__iter__'):
             self.fail('not_a_list', input_type=type(data).__name__)
         if not self.allow_empty and len(data) == 0:
             self.fail('empty')

rest_framework/utils/serializer_helpers.py

@@ -1,11 +1,10 @@
 from __future__ import unicode_literals
 
-import collections
 from collections import OrderedDict
 
 from django.utils.encoding import force_text
 
-from rest_framework.compat import unicode_to_repr
+from rest_framework.compat import MutableMapping, unicode_to_repr
 from rest_framework.utils import json
 
 
@@ -130,7 +129,7 @@ def as_form_field(self):
         return self.__class__(self._field, values, self.errors, self._prefix)
 
 
-class BindingDict(collections.MutableMapping):
+class BindingDict(MutableMapping):
     """
     This dict-like object is used to store fields on a serializer.