Ticket #5921: common-parent-class-for-user-and-anonymoususer.patch

django/contrib/auth/models.py

@@ -123 +123 @@
         from random import choice
         return ''.join([choice(allowed_chars) for i in range(length)])
 
-class User(models.Model):
+class UserClass(object):
+    id = None
+    username = ''
+    is_staff = False
+    is_active = True
+    is_superuser = False
+    
+    def __init__(self):
+        raise NotImplementedError, _(('UserClass is an abstract class. Use '
+                                      'either User or AnonymousUser instead.'))
+
+    def __unicode__(self):
+        raise NotImplementedError
+
+    def __str__(self):
+        raise NotImplementedError
+
+    def __eq__(self, other):
+        raise NotImplementedError
+
+    def __ne__(self, other):
+        raise NotImplementedError
+
+    def __hash__(self):
+        raise NotImplementedError
+
+    def save(self):
+        raise NotImplementedError
+
+    def delete(self):
+        raise NotImplementedError
+
+    def set_password(self, raw_password):
+        raise NotImplementedError
+
+    def check_password(self, raw_password):
+        raise NotImplementedError
+
+    def groups(self):
+        raise NotImplementedError
+    
+    def user_permissions(self):
+        raise NotImplementedError
+
+    def has_perm(self, perm):
+        raise NotImplementedError
+
+    def has_module_perms(self, module):
+        raise NotImplementedError
+
+    def get_and_delete_messages(self):
+        raise NotImplementedError
+
+    def is_anonymous(self):
+        raise NotImplementedError
+
+    def is_authenticated(self):
+        raise NotImpelementedError
+
+class User(models.Model, UserClass):
     """Users within the Django authentication system are represented by this model.
 
     Username and password are required. Other fields are optional.
@@ -318 +377 @@
     def __unicode__(self):
         return self.message
 
-class AnonymousUser(object):
+class UserObject(object):
     id = None
     username = ''
     is_staff = False
     is_active = True
     is_superuser = False
+    
+    def __init__(self):
+        raise NotImplementedError
+
+    def __unicode__(self):
+        raise NotImplementedError
+
+    def __str__(self):
+        raise NotImplementedError
+
+    def __eq__(self, other):
+        raise NotImplementedError
+
+    def __ne__(self, other):
+        raise NotImplementedError
+
+    def __hash__(self):
+        raise NotImplementedError
+
+    def save(self):
+        raise NotImplementedError
+
+    def delete(self):
+        raise NotImplementedError
+
+    def set_password(self, raw_password):
+        raise NotImplementedError
+
+    def check_password(self, raw_password):
+        raise NotImplementedError
+
+    def groups(self):
+        raise NotImplementedError
+    
+    def user_permissions(self):
+        raise NotImplementedError
+
+    def has_perm(self, perm):
+        raise NotImplementedError
+
+    def has_module_perms(self, module):
+        raise NotImplementedError
+
+    def get_and_delete_messages(self):
+        raise NotImplementedError
+
+    def is_anonymous(self):
+        raise NotImplementedError
+
+    def is_authenticated(self):
+        raise NotImpelementedError
+
+
+class AnonymousUser(UserClass):
+    id = None
+    username = ''
+    is_staff = False
+    is_active = True
+    is_superuser = False
     _groups = EmptyManager()
     _user_permissions = EmptyManager()