From 25a703b42c030f712734ed56b8f1996f8d13ac0c Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 23 Jan 2015 11:15:11 +0000
Subject: Work around meta API differences

---
 rest_framework/utils/model_meta.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/utils/model_meta.py b/rest_framework/utils/model_meta.py
index 375d2e8c..6a5835f5 100644
--- a/rest_framework/utils/model_meta.py
+++ b/rest_framework/utils/model_meta.py
@@ -121,12 +121,17 @@ def _get_reverse_relationships(opts):
     """
     Returns an `OrderedDict` of field names to `RelationInfo`.
     """
+    # Note that we have a hack here to handle internal API differences for
+    # this internal API across Django 1.7 -> Django 1.8.
+    # See: https://code.djangoproject.com/ticket/24208
+
     reverse_relations = OrderedDict()
     for relation in opts.get_all_related_objects():
         accessor_name = relation.get_accessor_name()
+        related = getattr(relation, 'related_model', relation.model)
         reverse_relations[accessor_name] = RelationInfo(
             model_field=None,
-            related=relation.model,
+            related=related,
             to_many=relation.field.rel.multiple,
             has_through_model=False
         )
@@ -134,9 +139,10 @@ def _get_reverse_relationships(opts):
     # Deal with reverse many-to-many relationships.
     for relation in opts.get_all_related_many_to_many_objects():
         accessor_name = relation.get_accessor_name()
+        related = getattr(relation, 'related_model', relation.model)
         reverse_relations[accessor_name] = RelationInfo(
             model_field=None,
-            related=relation.model,
+            related=related,
             to_many=True,
             has_through_model=(
                 (getattr(relation.field.rel, 'through', None) is not None)
-- 
cgit v1.2.3


From f1ac9d3f9b6c306b7fa48381006d8259c1642a99 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 23 Jan 2015 12:26:44 +0000
Subject: More graceful handling of malformed Content-Disposition

---
 rest_framework/parsers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework')

diff --git a/rest_framework/parsers.py b/rest_framework/parsers.py
index 401856ec..ef72677c 100644
--- a/rest_framework/parsers.py
+++ b/rest_framework/parsers.py
@@ -298,7 +298,7 @@ class FileUploadParser(BaseParser):
             if 'filename*' in filename_parm:
                 return self.get_encoded_filename(filename_parm)
             return force_text(filename_parm['filename'])
-        except (AttributeError, KeyError):
+        except (AttributeError, KeyError, ValueError):
             pass
 
     def get_encoded_filename(self, filename_parm):
-- 
cgit v1.2.3


From f3b6eedb8aeaa23f4b48551356814837973db31c Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 23 Jan 2015 12:56:55 +0000
Subject: More sensible response caching.

---
 rest_framework/response.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/response.py b/rest_framework/response.py
index d6ca1aad..7f90bae1 100644
--- a/rest_framework/response.py
+++ b/rest_framework/response.py
@@ -81,10 +81,13 @@ class Response(SimpleTemplateResponse):
 
     def __getstate__(self):
         """
-        Remove attributes from the response that shouldn't be cached
+        Remove attributes from the response that shouldn't be cached.
         """
         state = super(Response, self).__getstate__()
-        for key in ('accepted_renderer', 'renderer_context', 'data'):
+        for key in (
+            'accepted_renderer', 'renderer_context', 'resolver_match',
+            'client', 'request', 'wsgi_request', '_closable_objects'
+        ):
             if key in state:
                 del state[key]
         return state
-- 
cgit v1.2.3