encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-01 02:50:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use compat version of collections.abc.Mapping

Browse Source 
Since the Mapping class will no longer be available to import directly
from the collections module in Python 3.8, we should use the
compatibility helper introduced in #6154 in the fields module.
This commit is contained in:
Charlie Hornsby 2018-10-20 18:28:52 +03:00
parent 9d001cd84c
commit 339dfab5f5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/fields.py
View File

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