From e72428214c33b889f61ac83c7f39030b4c66317d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 26 Feb 2015 12:53:24 +0000
Subject: Formally upgrade suport to Django 1.8-beta

---
 README.md     | 2 +-
 docs/index.md | 2 +-
 tox.ini       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index eec80977..045cdbc4 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ There is a live example API for testing purposes, [available here][sandbox].
 # Requirements
 
 * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-alpha)
+* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta)
 
 # Installation
 
diff --git a/docs/index.md b/docs/index.md
index 23781419..91766a0b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -50,7 +50,7 @@ Some reasons you might want to use REST framework:
 REST framework requires the following:
 
 * Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)
-* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7)
+* Django (1.4.11+, 1.5.6+, 1.6.3+, 1.7, 1.8-beta)
 
 The following packages are optional:
 
diff --git a/tox.ini b/tox.ini
index b96b4939..f626268c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,7 @@ deps =
        django15: Django==1.5.6  # Should track minimum supported
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.2  # Should track maximum supported
-       django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/
+       django18alpha: https://www.djangoproject.com/download/1.8b1/tarball/
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-optionals.txt
 
-- 
cgit v1.2.3


From b3956bc591e7bd2c0d1460cdbc2731a372df25a5 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 26 Feb 2015 13:23:05 +0000
Subject: Upgrade testing env name to django18beta

---
 .travis.yml | 8 ++++----
 tox.ini     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4f929785..3eb89dc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,10 +21,10 @@ env:
     - TOX_ENV=py26-django15
     - TOX_ENV=py27-django14
     - TOX_ENV=py26-django14
-    - TOX_ENV=py34-django18alpha
-    - TOX_ENV=py33-django18alpha
-    - TOX_ENV=py32-django18alpha
-    - TOX_ENV=py27-django18alpha
+    - TOX_ENV=py34-django18beta
+    - TOX_ENV=py33-django18beta
+    - TOX_ENV=py32-django18beta
+    - TOX_ENV=py27-django18beta
 
 install:
   - pip install tox
diff --git a/tox.ini b/tox.ini
index f626268c..c986250c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist =
        py27-{flake8,docs},
        {py26,py27}-django14,
        {py26,py27,py32,py33,py34}-django{15,16},
-       {py27,py32,py33,py34}-django{17,18alpha}
+       {py27,py32,py33,py34}-django{17,18beta}
 
 [testenv]
 commands = ./runtests.py --fast
@@ -14,7 +14,7 @@ deps =
        django15: Django==1.5.6  # Should track minimum supported
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.2  # Should track maximum supported
-       django18alpha: https://www.djangoproject.com/download/1.8b1/tarball/
+       django18beta: https://www.djangoproject.com/download/1.8b1/tarball/
        -rrequirements/requirements-testing.txt
        -rrequirements/requirements-optionals.txt
 
-- 
cgit v1.2.3


From 4b745eef3a452b79bac0fc2e7703aa0ade6836fb Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 26 Feb 2015 13:25:14 +0000
Subject: Update test for more graceful 1.8 handling of malformed filename
 encodings

---
 tests/test_parsers.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/test_parsers.py b/tests/test_parsers.py
index 8816065a..a9f32a65 100644
--- a/tests/test_parsers.py
+++ b/tests/test_parsers.py
@@ -101,9 +101,10 @@ class TestFileUploadParser(TestCase):
 
         self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt')
         filename = parser.get_filename(self.stream, None, self.parser_context)
-        # Malformed. Either None or 'fallback.txt' will be acceptable.
+
+        # Malformed. Either None, 'ÀĥƦ.txt' or 'fallback.txt' will be acceptable.
         # See also https://code.djangoproject.com/ticket/24209
-        self.assertIn(filename, ('fallback.txt', None))
+        self.assertIn(filename, ('fallback.txt', 'ÀĥƦ.txt', None))
 
     def __replace_content_disposition(self, disposition):
         self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition
-- 
cgit v1.2.3


From 1b398a20decbf6e10173d280bc4fccd86a94b629 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 26 Feb 2015 13:41:25 +0000
Subject: Who care what we do when it's totally malformed? Not me.

---
 tests/test_parsers.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/test_parsers.py b/tests/test_parsers.py
index a9f32a65..fe6aec19 100644
--- a/tests/test_parsers.py
+++ b/tests/test_parsers.py
@@ -99,12 +99,5 @@ class TestFileUploadParser(TestCase):
         filename = parser.get_filename(self.stream, None, self.parser_context)
         self.assertEqual(filename, 'ÀĥƦ.txt')
 
-        self.__replace_content_disposition('inline; filename=fallback.txt; filename*=utf-8--ÀĥƦ.txt')
-        filename = parser.get_filename(self.stream, None, self.parser_context)
-
-        # Malformed. Either None, 'ÀĥƦ.txt' or 'fallback.txt' will be acceptable.
-        # See also https://code.djangoproject.com/ticket/24209
-        self.assertIn(filename, ('fallback.txt', 'ÀĥƦ.txt', None))
-
     def __replace_content_disposition(self, disposition):
         self.parser_context['request'].META['HTTP_CONTENT_DISPOSITION'] = disposition
-- 
cgit v1.2.3