removed django1.4 specific code

Author: synasius

oauth2_provider/models.py

@@ -126,10 +126,8 @@ def __str__(self):
 
 
 class Application(AbstractApplication):
-    pass
-
-# Add swappable like this to not break django 1.4 compatibility
-Application._meta.swappable = 'OAUTH2_PROVIDER_APPLICATION_MODEL'
+    class Meta(AbstractApplication.Meta):
+        swappable = 'OAUTH2_PROVIDER_APPLICATION_MODEL'
 
 
 @python_2_unicode_compatible

oauth2_provider/tests/test_mixins.py

@@ -3,7 +3,6 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.views.generic import View
 from django.test import TestCase, RequestFactory
-from django.http import HttpResponse
 
 from oauthlib.oauth2 import Server
 
@@ -100,10 +99,6 @@ class TestView(ProtectedResourceMixin, View):
             server_class = Server
             validator_class = OAuth2Validator
 
-            def options(self, request, *args, **kwargs):
-                """Django 1.4 doesn't provide a default options method"""
-                return HttpResponse()
-
         request = self.request_factory.options("/fake-req")
         view = TestView.as_view()
         response = view(request)

oauth2_provider/tests/test_models.py

@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 
-from unittest import skipIf
-
 import django
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
@@ -109,7 +107,6 @@ def test_scopes_property(self):
         self.assertEqual(access_token2.scopes, {'write': 'Writing scope'})
 
 
-@skipIf(django.VERSION < (1, 5), "Behavior is broken on 1.4 and there is no solution")
 @override_settings(OAUTH2_PROVIDER_APPLICATION_MODEL='tests.TestApplication')
 class TestCustomApplicationModel(TestCase):
     def setUp(self):