aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/compat.py4
-rw-r--r--rest_framework/generics.py2
-rw-r--r--rest_framework/permissions.py2
-rw-r--r--rest_framework/request.py4
-rw-r--r--rest_framework/serializers.py8
5 files changed, 11 insertions, 9 deletions
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 7664c400..b0367a32 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -1,6 +1,8 @@
"""
-The :mod:`compat` module provides support for backwards compatibility with older versions of django/python.
+The `compat` module provides support for backwards compatibility with older
+versions of django/python, and compatbility wrappers around optional packages.
"""
+# flake8: noqa
import django
# cStringIO only if it's available, otherwise StringIO
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 81014026..190a5f79 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -125,7 +125,7 @@ class RetrieveAPIView(mixins.RetrieveModelMixin,
class DestroyAPIView(mixins.DestroyModelMixin,
- SingleObjectAPIView):
+ SingleObjectAPIView):
"""
Concrete view for deleting a model instance.
diff --git a/rest_framework/permissions.py b/rest_framework/permissions.py
index 6f848cee..51e96196 100644
--- a/rest_framework/permissions.py
+++ b/rest_framework/permissions.py
@@ -85,7 +85,7 @@ class DjangoModelPermissions(BasePermission):
"""
kwargs = {
'app_label': model_cls._meta.app_label,
- 'model_name': model_cls._meta.module_name
+ 'model_name': model_cls._meta.module_name
}
return [perm % kwargs for perm in self.perms_map[method]]
diff --git a/rest_framework/request.py b/rest_framework/request.py
index 5870be82..a1827ba4 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -21,8 +21,8 @@ def is_form_media_type(media_type):
Return True if the media type is a valid form media type.
"""
base_media_type, params = parse_header(media_type)
- return base_media_type == 'application/x-www-form-urlencoded' or \
- base_media_type == 'multipart/form-data'
+ return (base_media_type == 'application/x-www-form-urlencoded' or
+ base_media_type == 'multipart/form-data')
class Empty(object):
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index db6f9f61..8a895343 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -34,10 +34,10 @@ def _is_protected_type(obj):
"""
return isinstance(obj, (
types.NoneType,
- int, long,
- datetime.datetime, datetime.date, datetime.time,
- float, Decimal,
- basestring)
+ int, long,
+ datetime.datetime, datetime.date, datetime.time,
+ float, Decimal,
+ basestring)
)