Merge branch 'version-3.1' into oauth_as_package

Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini

1 files changed, 0 insertions, 19 deletions

diff --git a/tests/test_serializer_import.py b/tests/test_serializer_import.py
deleted file mode 100644
index d029c3c5..00000000
--- a/tests/test_serializer_import.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# from django.test import TestCase
-
-# from rest_framework import serializers
-# from tests.accounts.serializers import AccountSerializer
-
-
-# class ImportingModelSerializerTests(TestCase):
-#     """
-#     In some situations like, GH #1225, it is possible, especially in
-#     testing, to import a serializer who's related models have not yet
-#     been resolved by Django. `AccountSerializer` is an example of such
-#     a serializer (imported at the top of this file).
-#     """
-#     def test_import_model_serializer(self):
-#         """
-#         The serializer at the top of this file should have been
-#         imported successfully, and we should be able to instantiate it.
-#         """
-#         self.assertIsInstance(AccountSerializer(), serializers.ModelSerializer)