From 282e53b4995a6b908448d50f83b40a70ceaae808 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 31 Oct 2010 16:49:36 +0000 Subject: [PATCH] Reflow django/contrib/auth/management/__init__.py for readability. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14408 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/auth/management/__init__.py | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/django/contrib/auth/management/__init__.py b/django/contrib/auth/management/__init__.py index 01fa52430f..49ab56a872 100644 --- a/django/contrib/auth/management/__init__.py +++ b/django/contrib/auth/management/__init__.py @@ -17,24 +17,29 @@ def _get_all_permissions(opts): def create_permissions(app, created_models, verbosity, **kwargs): from django.contrib.contenttypes.models import ContentType - from django.contrib.auth.models import Permission + app_models = get_models(app) - if not app_models: - return for klass in app_models: ctype = ContentType.objects.get_for_model(klass) for codename, name in _get_all_permissions(klass._meta): - p, created = Permission.objects.get_or_create(codename=codename, content_type__pk=ctype.id, - defaults={'name': name, 'content_type': ctype}) + p, created = auth_app.Permission.objects.get_or_create( + codename=codename, + content_type__pk=ctype.id, + defaults={ + 'name': name, + 'content_type': ctype + } + ) if created and verbosity >= 2: print "Adding permission '%s'" % p def create_superuser(app, created_models, verbosity, **kwargs): - from django.contrib.auth.models import User from django.core.management import call_command - if User in created_models and kwargs.get('interactive', True): - msg = "\nYou just installed Django's auth system, which means you don't have " \ - "any superusers defined.\nWould you like to create one now? (yes/no): " + + if auth_app.User in created_models and kwargs.get('interactive', True): + msg = ("\nYou just installed Django's auth system, which means you " + "don't have any superusers defined.\nWould you like to create one " + "now? (yes/no): ") confirm = raw_input(msg) while 1: if confirm not in ('yes', 'no'):