[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
This commit is contained in:
Simon Meers 2010-12-04 01:23:11 +00:00
parent e0d68084a0
commit 84e5277a25

View File

@ -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