Merge pull request #96 from francoisfreitag/remove_deprecated

Dropped support for Python < 2.7 and Django < 1.8

Author: knaperek

CHANGES

@@ -1,5 +1,10 @@
 Changes
 =======
+
+UNRELEASED
+----------
+- Dropped compatibility for Python < 2.7 and Django < 1.8.
+
 0.16.10 (2017-10-02)
 -------------------
 - Bugfixes and internal refactorings.

djangosaml2/backends.py

@@ -18,17 +18,12 @@
 from django.conf import settings
 from django.contrib import auth
 from django.contrib.auth.backends import ModelBackend
-from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned, \
-    ImproperlyConfigured
+from django.core.exceptions import (
+    MultipleObjectsReturned, ImproperlyConfigured,
+)
 
 from djangosaml2.signals import pre_user_save
 
-try:
-    from django.contrib.auth.models import SiteProfileNotAvailable
-except ImportError:
-    class SiteProfileNotAvailable(Exception):
-        pass
-
 
 logger = logging.getLogger('djangosaml2')
 
@@ -211,24 +206,12 @@ def update_user(self, user, attributes, attribute_mapping,
 
         By default it uses a mapping defined in the settings constant
         SAML_ATTRIBUTE_MAPPING. For each attribute, if the user object has
-        that field defined it will be set, otherwise it will try to set
-        it in the profile object.
+        that field defined it will be set.
         """
         if not attribute_mapping:
             return user
 
-        try:
-            profile = user.get_profile()
-        except ObjectDoesNotExist:
-            profile = None
-        except SiteProfileNotAvailable:
-            profile = None
-        # Django 1.5 custom model assumed
-        except AttributeError:
-            profile = user
-
         user_modified = False
-        profile_modified = False
         for saml_attr, django_attrs in attribute_mapping.items():
             attr_value_list = attributes.get(saml_attr)
             if not attr_value_list:
@@ -244,10 +227,6 @@ def update_user(self, user, attributes, attribute_mapping,
 
                     user_modified = user_modified or modified
 
-                elif profile is not None and hasattr(profile, attr):
-                    modified = self._set_attribute(profile, attr, attr_value_list[0])
-                    profile_modified = profile_modified or modified
-
         logger.debug('Sending the pre_save signal')
         signal_modified = any(
             [response for receiver, response
@@ -260,10 +239,6 @@ def update_user(self, user, attributes, attribute_mapping,
         if user_modified or signal_modified or force_save:
             user.save()
 
-        if (profile is not None
-            and (profile_modified or signal_modified or force_save)):
-            profile.save()
-
         return user
 
     def _set_attribute(self, obj, attr, value):

djangosaml2/cache.py

@@ -14,7 +14,6 @@
 # limitations under the License.
 
 from saml2.cache import Cache
-from saml2.ident import code, decode
 
 
 class DjangoSessionCacheAdapter(dict):

djangosaml2/tests/__init__.py

@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import django
 from django.conf.urls import url
 from djangosaml2 import views
 

djangosaml2/urls.py

@@ -119,11 +119,7 @@
 STATIC_URL = '/static/'
 
 
-AUTH_PROFILE_MODULE = 'testprofiles.TestProfile'
-
-import django
-if django.VERSION >= (1, 7):
-    AUTH_USER_MODEL = 'testprofiles.TestUser'
+AUTH_USER_MODEL = 'testprofiles.TestUser'
 
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to

tests/settings.py

@@ -13,26 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import django
+from django.contrib.auth.models import AbstractUser
 from django.db import models
 
-if django.VERSION < (1, 7):
-    class TestProfile(models.Model):
-        user = models.OneToOneField('auth.User')
-        age = models.CharField(max_length=100, blank=True)
 
-        def process_first_name(self, first_name):
-            self.first_name = first_name[0]
-else:
-    from django.contrib.auth.models import AbstractUser
-    class TestUser(AbstractUser):
-        age = models.CharField(max_length=100, blank=True)
-        def process_first_name(self, first_name):
-            self.first_name = first_name[0]
+class TestUser(AbstractUser):
+    age = models.CharField(max_length=100, blank=True)
 
-    class StandaloneUserModel(models.Model):
-        """
-        Does not inherit from Django's base abstract user and does not define a
-        USERNAME_FIELD.
-        """
-        username = models.CharField(max_length=30, unique=True)
+    def process_first_name(self, first_name):
+        self.first_name = first_name[0]
+
+
+class StandaloneUserModel(models.Model):
+    """
+    Does not inherit from Django's base abstract user and does not define a
+    USERNAME_FIELD.
+    """
+    username = models.CharField(max_length=30, unique=True)

tests/testprofiles/models.py

@@ -14,23 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import django
-
-try:
-    from django.contrib.auth import get_user_model
-except ImportError:
-    from django.contrib.auth.models import User
-else:
-    User = get_user_model()
-
+from django.contrib.auth import get_user_model
 from django.contrib.auth.models import User as DjangoUserModel
-
 from django.test import TestCase, override_settings
 
 from djangosaml2.backends import Saml2Backend
 
-if django.VERSION < (1,7):
-    from testprofiles.models import TestProfile
+User = get_user_model()
 
 
 class Saml2BackendTests(TestCase):
@@ -57,19 +47,10 @@ def test_update_user(self):
         self.assertEqual(user.first_name, 'John')
         self.assertEqual(user.last_name, 'Doe')
 
-        # now we create a user profile and link it to the user
-        if django.VERSION < (1, 7):
-            profile = TestProfile.objects.create(user=user)
-            self.assertNotEquals(profile, None)
-
         attribute_mapping['saml_age'] = ('age', )
         attributes['saml_age'] = ('22', )
         backend.update_user(user, attributes, attribute_mapping)
-
-        if django.VERSION < (1, 7):
-            self.assertEqual(user.get_profile().age, '22')
-        else:
-            self.assertEqual(user.age, '22')
+        self.assertEqual(user.age, '22')
 
     def test_update_user_callable_attributes(self):
         user = User.objects.create(username='john')