Ticket #13914: contrib_auth_user_group_natural_key.patch

django/contrib/auth/models.py

@@ -84 +84 @@
         return (self.codename,) + self.content_type.natural_key()
     natural_key.dependencies = ['contenttypes.contenttype']
 
+class GroupManager(models.Manager):
+    def get_by_natural_key(self, name):
+        return self.get(name=name)
+
 class Group(models.Model):
     """Groups are a generic way of categorizing users to apply permissions, or some other label, to those users. A user can belong to any number of groups.
 
@@ -93 +97 @@
     """
     name = models.CharField(_('name'), max_length=80, unique=True)
     permissions = models.ManyToManyField(Permission, verbose_name=_('permissions'), blank=True)
+    objects = GroupManager()
 
     class Meta:
         verbose_name = _('group')
@@ -101 +106 @@
     def __unicode__(self):
         return self.name
 
+    def natural_key(self):
+        return (self.name,)
+
 class UserManager(models.Manager):
     def create_user(self, username, email, password=None):
         """
@@ -144 +152 @@
         from random import choice
         return ''.join([choice(allowed_chars) for i in range(length)])
 
+    def get_by_natural_key(self, username):
+        return self.get(username=username)
 
+
 # A few helper functions for common logic between User and AnonymousUser.
 def _user_get_all_permissions(user, obj):
     permissions = set()
@@ -381 +392 @@
         return self._message_set
     message_set = property(_get_message_set)
 
+    def natural_key(self):
+        return (self.username,)
+
 class Message(models.Model):
     """
     The message system is a lightweight way to queue messages for given