Ticket #7599: get_user_permissions_patch_1.diff

django/contrib/auth/backends.py

@@ -19 +19 @@
         except User.DoesNotExist:
             return None
 
+    def get_user_permissions(self, user_obj):
+        """
+        Returns a set of permission strings directly tied to user_obj.
+        """
+        return set([u"%s.%s" % (p.content_type.app_label, p.codename)
+                    for p in user_obj.user_permissions.select_related()])
+
     def get_group_permissions(self, user_obj):
         """
         Returns a set of permission strings that this user has through his/her
@@ -35 +42 @@
         if user_obj.is_anonymous():
             return set()
         if not hasattr(user_obj, '_perm_cache'):
-            user_obj._perm_cache = set([u"%s.%s" % (p.content_type.app_label, p.codename) for p in user_obj.user_permissions.select_related()])
+            user_obj._perm_cache = self.get_user_permissions(user_obj)
             user_obj._perm_cache.update(self.get_group_permissions(user_obj))
         return user_obj._perm_cache
 

docs/topics/auth.txt

@@ -209 +209 @@
         :meth:`~django.contrib.auth.models.User.set_unusable_password()` has
         been called for this user.
 
+    .. method:: models.User.get_user_permissions(obj=None)
+
+        Returns a list of permission strings that the user has.
+
+        .. versionadded:: 1.3
+
+        If ``obj`` is passed in, only returns the user permissions for
+        this specific object.
+
     .. method:: models.User.get_group_permissions(obj=None)
 
         Returns a list of permission strings that the user has, through his/her
@@ -1527 +1536 @@
 Custom auth backends can provide their own permissions.
 
 The user model will delegate permission lookup functions
-(:meth:`~django.contrib.auth.models.User.get_group_permissions()`,
+((:meth:`~django.contrib.auth.models.User.get_user_permissions()`,
+:meth:`~django.contrib.auth.models.User.get_group_permissions()`,
 :meth:`~django.contrib.auth.models.User.get_all_permissions()`,
 :meth:`~django.contrib.auth.models.User.has_perm()`, and
 :meth:`~django.contrib.auth.models.User.has_module_perms()`) to any