[generic-auth] Added a has_permissions convenience function and did some misc. cleanup. Tests actually run now too, which is nice.

git-svn-id: http://code.djangoproject.com/svn/django/branches/generic-auth@4030 bcc190cf-cafb-0310-a4f2-bffc1f526a37

3 files changed, 79 insertions, 68 deletions

diff --git a/django/contrib/auth/__init__.py b/django/contrib/auth/__init__.py
index 6b3add2c91..121abf3fcd 100644
--- a/django/contrib/auth/__init__.py
+++ b/django/contrib/auth/__init__.py
@@ -34,6 +34,12 @@ class HasPermission(object):
 
 has_permission = HasPermission()
 
+def has_permissions(user, permission_list, obj=None):
+    for permission in permission_list:
+        if not has_permission(user, permission, obj):
+            return False
+    return True
+
 def load_backend(path):
     i = path.rfind('.')
     module, attr = path[:i], path[i+1:]
diff --git a/tests/regressiontests/generic_auth/models.py b/tests/regressiontests/generic_auth/models.py
index 939e173c6d..1852b1892c 100644
--- a/tests/regressiontests/generic_auth/models.py
+++ b/tests/regressiontests/generic_auth/models.py
@@ -1,72 +1,4 @@
-"""
-XX. Permissions
-
-"""
-
 from django.db import models
 
 class Person(models.Model):
     name = models.CharField(maxlength=20)
-
-API_TESTS = """
->>> from django.contrib.auth.models import User, Permission
->>> from django.db.models.loading import get_app
->>> from django.contrib.auth.management import create_permissions
->>> from django.contrib.auth import has_permission
-
->>> app = get_app('generic_auth')
->>> create_permissions(app, [])
-Adding permission 'person | Can add person'
-Adding permission 'person | Can change person'
-Adding permission 'person | Can delete person'
-
-
-Create and register an authorization handler that acts like Django's model
-level permissions
-
->>> def default_has_permission(user, permission, obj):
-...     p_name = "%s.%s" % (permission.content_type.app_label, permission.codename)
-...     return user.has_perm(p_name)
-...     
->>> has_permission.register(default_has_permission, User, Permission, Person)
->>> has_permission.register(default_has_permission, User, Permission)
-
-
-Create a new user
-
->>> user = User.objects.create_user('test', 'test@example.com', 'password')
->>> user.save()
-
-
-Create a Person that we'll check from access to.
-
->>> person = Person(name='test')
->>> person.save()
-
-
-Get permissions from the model
-
->>> opts = Person._meta
->>> add_permission = opts.get_add_permission()
->>> change_permission = opts.get_change_permission()
->>> delete_permission = opts.get_delete_permission()
-
-
-Give the user add, change, and delete permissions for Person models, then check that permission.
-
->>> user.user_permissions.add(add_permission)
->>> user.user_permissions.add(change_permission)
->>> user.user_permissions.add(delete_permission)
->>> user.save()
-
-
-The user should have add, change, and delete permissions now. Make sure they do.
-
->>> has_permission(user, add_permission)
-True
->>> has_permission(user, change_permission, person)
-True
->>> has_permission(user, delete_permission, person)
-True
-
-"""
diff --git a/tests/regressiontests/generic_auth/tests.py b/tests/regressiontests/generic_auth/tests.py
new file mode 100644
index 0000000000..96c9d1bbdc
--- /dev/null
+++ b/tests/regressiontests/generic_auth/tests.py
@@ -0,0 +1,73 @@
+"""
+>>> from django.contrib.auth.models import User, Permission
+>>> from django.db.models.loading import get_app
+>>> from django.contrib.auth.management import create_permissions
+>>> from django.contrib.auth import has_permission, has_permissions
+
+>>> from regressiontests.generic_auth.models import Person
+
+>>> app = get_app('generic_auth')
+>>> create_permissions(app, [], 0)
+
+Create and register an authorization handler that acts like Django's model
+level permissions
+
+>>> def default_has_permission(user, permission, obj):
+...     p_name = "%s.%s" % (permission.content_type.app_label, permission.codename)
+...     return user.has_perm(p_name)
+...     
+>>> has_permission.register(default_has_permission, User, Permission, Person)
+>>> has_permission.register(default_has_permission, User, Permission)
+
+
+Create a new user
+
+>>> user = User.objects.create_user('test', 'test@example.com', 'password')
+>>> user.save()
+
+
+Create a Person that we'll check from access to.
+
+>>> person = Person(name='test')
+>>> person.save()
+
+
+Get permissions from the model
+
+>>> opts = Person._meta
+>>> add_permission = opts.get_add_permission()
+>>> change_permission = opts.get_change_permission()
+>>> delete_permission = opts.get_delete_permission()
+
+
+Give the user add and change permissions for Person models.
+
+>>> user.user_permissions.add(add_permission)
+>>> user.user_permissions.add(change_permission)
+>>> user.save()
+
+
+Make sure has_permission knows the user has add and delete permissions on Person
+objects.
+
+>>> has_permission(user, add_permission)
+True
+>>> has_permission(user, change_permission, person)
+True
+
+
+Make sure the user doesn't have the delete permission though.
+
+>>> has_permission(user, delete_permission, person)
+False
+
+
+There is also a has_permissions function for convenience. It takes a list of 
+permissions rather than a single one.
+
+>>> has_permissions(user, [add_permission, change_permission], person)
+True
+>>> has_permissions(user, [add_permission, delete_permission], person)
+False
+
+"""