From 84e5277a25989cadf54eba5b74292604135ae5dc Mon Sep 17 00:00:00 2001 From: Simon Meers Date: Sat, 4 Dec 2010 01:23:11 +0000 Subject: [PATCH] [1.2.X] Fixed #14764 -- specified that a set is returned by User.get_..._permissions methods. Thanks MostAwesomeDude for the report. Backport of r14787 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14788 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/topics/auth.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt index 332d61419a..a58e523ea1 100644 --- a/docs/topics/auth.txt +++ b/docs/topics/auth.txt @@ -212,7 +212,7 @@ Methods .. method:: models.User.get_group_permissions(obj=None) - Returns a list of permission strings that the user has, through his/her + Returns a set of permission strings that the user has, through his/her groups. .. versionadded:: 1.2 @@ -222,7 +222,7 @@ Methods .. method:: models.User.get_all_permissions(obj=None) - Returns a list of permission strings that the user has, both through + Returns a set of permission strings that the user has, both through group and user permissions. .. versionadded:: 1.2