drop everything related to old AUTH_USER_PROFILE deprecated since dja…

…ngo 1.7

django_th/forms/base.py

@@ -4,7 +4,7 @@
 
 # trigger happy
 from django_th.models import User, UserService, \
-    UserProfile, ServicesActivated, TriggerService
+    ServicesActivated, TriggerService
 
 
 class TriggerServiceForm(forms.ModelForm):
@@ -16,7 +16,8 @@ class Meta:
             meta to add/override anything we need
         """
         model = TriggerService
-        exclude = ['provider', 'consumer', 'user', 'date_triggered', 'date_created', 'status']
+        exclude = ['provider', 'consumer', 'user', 'date_triggered',
+                   'date_created', 'status']
         widgets = {
             'description': TextInput(attrs={'class': 'form-control'}),
         }
@@ -75,72 +76,3 @@ class Meta:
             'password': PasswordInput(attrs={'placeholder': _('Password')}),
         }
         exclude = ()
-
-
-class ProfileForm(forms.ModelForm):
-    """
-        Form to manage the User profile
-    """
-    class Meta:
-        """
-            meta to override anything about UserProfile
-        """
-        model = UserProfile
-        exclude = ('user',)
-
-    def __init__(self, *args, **kwargs):
-        super(ProfileForm, self).__init__(*args, **kwargs)
-        try:
-            self.fields['email'].initial = self.instance.user.email
-            self.fields['first_name'].initial = self.instance.user.first_name
-            self.fields['last_name'].initial = self.instance.user.last_name
-        except User.DoesNotExist:
-            pass
-
-    email = forms.EmailField(label=_("Email"),
-                             help_text=_('Your email will be used only in the \
-                             following case and nothing more <ul><li>to send \
-                             your activation mail</li><li>to send recovery \
-                             password when you forgot yours</li><li>to send \
-                             notifications</li></ul>'))
-    last_name = forms.CharField(label=_('Last Name'))
-    first_name = forms.CharField(label=_('First Name'))
-
-    def save(self, commit=True):
-        """
-            Update the primary email address on the related User object as well
-        """
-        usr = self.instance.user
-        usr.email = self.cleaned_data['email']
-        usr.last_name = self.cleaned_data['last_name']
-        usr.first_name = self.cleaned_data['first_name']
-        usr.save()
-        profile = super(ProfileForm, self).save(commit=False)
-        return profile
-
-
-class UserProfileForm(forms.ModelForm):
-    """
-        Form to deal with the fields of the User Model
-    """
-    first_name = forms.CharField(label=_('Last Name'), max_length=30)
-    last_name = forms.CharField(label=_('First Name'), max_length=30)
-
-    def __init__(self, *args, **kw):
-        super(UserProfileForm, self).__init__(*args, **kw)
-        self.fields['first_name'].initial = self.instance.user.first_name
-        self.fields['last_name'].initial = self.instance.user.last_name
-        self.fields.keyOrder = ['first_name', 'last_name', ]
-
-    def save(self, *args, **kw):
-        super(UserProfileForm, self).save(*args, **kw)
-        self.instance.user.first_name = self.cleaned_data.get('first_name')
-        self.instance.user.last_name = self.cleaned_data.get('last_name')
-        self.instance.user.save()
-
-    class Meta:
-        """
-            meta to override anything about UserProfile
-        """
-        model = UserProfile
-        exclude = ()

django_th/models/__init__.py

@@ -1,11 +1,8 @@
 # coding: utf-8
 from django.db import models
-from django.db.models.signals import post_save
 from django.contrib.auth.models import User
-from django.utils.encoding import python_2_unicode_compatible
 
 
-@python_2_unicode_compatible
 class ServicesActivated(models.Model):
     """
         Services Activated from the admin
@@ -21,27 +18,13 @@ class Meta:
 
     def show(self):
         return "Service Activated %s %s %s %s" % (self.name, self.status,
-                                                  self.auth_required, self.description)
+                                                  self.auth_required,
+                                                  self.description)
 
     def __str__(self):
         return "%s" % self.name
 
 
-@python_2_unicode_compatible
-class UserProfile(models.Model):
-    """
-        Related user to handle his profile
-    """
-    user = models.OneToOneField(User)
-
-    def show(self):
-        return "User profile %s" % self.user_id
-
-    def __str__(self):
-        return "%s" % self.user
-
-
-@python_2_unicode_compatible
 class UserService(models.Model):
     """
         UserService a model to link service and user
@@ -58,7 +41,6 @@ def __str__(self):
         return "%s" % self.name
 
 
-@python_2_unicode_compatible
 class TriggerService(models.Model):
     """
         TriggerService
@@ -72,17 +54,8 @@ class TriggerService(models.Model):
     status = models.BooleanField(default=False)
 
     def show(self):
-        return "My Service %s %s %s %s" % (self.provider, self.consumer, self.description, self.user)
+        return "My Service %s %s %s %s" % (self.provider, self.consumer,
+                                           self.description, self.user)
 
     def __str__(self):
         return "%s %s " % (self.provider, self.consumer)
-
-
-def create_user_profile(sender, instance, created, **kwargs):
-    """
-        function to create the record in the UserProfile model
-    """
-    if created:
-        UserProfile.objects.create(user=instance)
-
-post_save.connect(create_user_profile, sender=User)

django_th/models/services.py

@@ -10,11 +10,13 @@ class Services(models.Model):
     status = models.BooleanField(default=False)
     description = models.CharField(max_length=255)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s" % self.name
 
     def show(self):
-        return "Services Model %s %s %s " % (self.name, self.status, self.description)
+        return "Services Model %s %s %s " % (self.name,
+                                             self.status,
+                                             self.description)
 
     class Meta:
         app_label = 'django_th'

django_th/services/services.py

@@ -12,7 +12,7 @@ class __ServicesMgr:
         def __init__(self, arg):
             self.val = arg
 
-        def __unicode__(self):
+        def __str__(self):
             return repr(self) + self.val
 
     instance = None
@@ -26,7 +26,7 @@ def __init__(self, arg):
     def __getattr__(self, name):
         return getattr(self.instance, name)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s" % self.name
 
     def set_title(self, string):

django_th/settings.py

@@ -195,9 +195,6 @@
     }
 }
 
-
-AUTH_PROFILE_MODULE = 'django_th.UserProfile'
-
 # go back on home page after logged in
 LOGIN_REDIRECT_URL = reverse_lazy('base')
 

django_th/tests/test_models_and_services.py

@@ -1,26 +1,12 @@
 # coding: utf-8
 from django.test import TestCase
 from django.contrib.auth.models import User
-from django_th.models import UserProfile, TriggerService
+from django_th.models import TriggerService
 from django_th.models import UserService, ServicesActivated
 from django_th.forms.base import TriggerServiceForm
 from django_th.forms.base import UserServiceForm
 
 
-class UserProfileTest(TestCase):
-
-    """
-        UserProfile Model
-    """
-    def create_userprofile(self, user_id=111):
-        return UserProfile.objects.create(user_id=user_id)
-
-    def test_userprofile(self):
-        u = self.create_userprofile()
-        self.assertTrue(isinstance(u, UserProfile))
-        self.assertEqual(u.show(), "User profile %s" % u.user_id)
-
-
 class UserServiceTest(TestCase):
 
     """