Changeset 8282

Timestamp:

08/10/08 03:42:49 (4 months ago)

Author:

russellm

Message:

Fixed #5943 -- Modified django-admin to behave like manage.py if settings are provided, either as --settings or DJANGO_SETTINGS_MODULE. Thanks to Joseph Kocherhans and Todd O'Bryan for their work on this ticket.

Files:

• django/trunk/django/core/management/base.py (modified) (1 diff)
• django/trunk/django/core/management/__init__.py (modified) (9 diffs)
• django/trunk/tests/regressiontests/admin_scripts/tests.py (modified) (11 diffs)

django/trunk/django/core/management/base.py

@@ -83 +83 @@
-        # because django.utils.translation requires settings.
-        if self.can_import_settings:
-
-
-
+
+
+
+
+
+
+
+
-        try:
-            if self.requires_model_validation:

django/trunk/django/core/management/__init__.py

@@ -67 +67 @@
-                   {}, {}, ['Command']), 'Command')()
-
-load_user_commands=True, project_directory=None
+
-    """
-    Returns a dictionary mapping command names to their callback applications.
@@ -78 +78 @@
-    specified, user-defined commands will also be included, the
-    startproject command will be disabled, and the startapp command
-at
+e settings
-
-    The dictionary is in the format {command_name: app_name}. Key-value
@@ -95 +95 @@
-        _commands = dict([(name, 'django.core') for name in find_commands(__path__[0])])
-
-if load_user_commands:
-    # Get commands from all installed apps.
+# Find the installed apps
+try:
-            from django.conf import settings
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if project_directory:
@@ -204 +217 @@
-        self.argv = argv or sys.argv[:]
-        self.prog_name = os.path.basename(self.argv[0])
-        self.project_directory = None
-        self.user_commands = False
-
-    def main_help_text(self):
@@ -213 +224 @@
-        usage = ['',"Type '%s help <subcommand>' for help on a specific subcommand." % self.prog_name,'']
-        usage.append('Available subcommands:')
-self.user_commands, self.project_directory
+
-        commands.sort()
-        for cmd in commands:
@@ -226 +237 @@
-        """
-        try:
-self.user_commands, self.project_directory
+
-            if isinstance(app_name, BaseCommand):
-                # If the command is already loaded, use it directly.
@@ -279 +290 @@
-            self.fetch_command(subcommand).run_from_argv(self.argv)
-
-class ProjectManagementUtility(ManagementUtility):
-    """
-    A ManagementUtility that is specific to a particular Django project.
-    As such, its commands are slightly different than those of its parent
-    class.
-
-    In practice, this class represents manage.py, whereas ManagementUtility
-    represents django-admin.py.
-    """
-    def __init__(self, argv, project_directory):
-        super(ProjectManagementUtility, self).__init__(argv)
-        self.project_directory = project_directory
-        self.user_commands = True
-
-def setup_environ(settings_mod):
-    """
@@ -314 +311 @@
-    # Set DJANGO_SETTINGS_MODULE appropriately.
-    os.environ['DJANGO_SETTINGS_MODULE'] = '%s.%s' % (project_name, settings_name)
-    return project_directory
-
-def execute_from_command_line(argv=None):
@@ -328 +324 @@
-    project-specific django-admin.py utility.
-    """
-project_directory = 
-ProjectManagementUtility(argv, project_directory
+
+ManagementUtility(argv
-    utility.execute()

django/trunk/tests/regressiontests/admin_scripts/tests.py

@@ -224 +224 @@
-
-    def test_custom_command(self):
-
+ if it isn't provided settings
-        args = ['noargs_command']
-        out, err = self.run_django_admin(args)
@@ -231 +231 @@
-
-    def test_custom_command_with_settings(self):
-'t execute user commands, even
+ execute user commands
-        args = ['noargs_command', '--settings=settings']
-        out, err = self.run_django_admin(args)
-out
-err, "Unknown command: 'noargs_command'
+err
+out, "EXECUTE:NoArgsCommand
-
-    def test_custom_command_with_environment(self):
-'t execute user commands, even
+ execute user commands
-        args = ['noargs_command']
-        out, err = self.run_django_admin(args,'settings')
-out
-err, "Unknown command: 'noargs_command'
+err
+out, "EXECUTE:NoArgsCommand
-
-class DjangoAdminFullPathDefaultSettings(AdminScriptTestCase):
@@ -262 +262 @@
-
-    def test_builtin_with_settings(self):
-fail if user app isn't on path
+succeed if a settings file is provided
-        args = ['sqlall','--settings=settings', 'admin_scripts']
-        out, err = self.run_django_admin(args)
-out
-err, 'ImportError: No module named regressiontests
+err
+out, 'CREATE TABLE
-
-    def test_builtin_with_environment(self):
-fail if user app isn't on path
+succeed if the environment contains settings
-        args = ['sqlall','admin_scripts']
-        out, err = self.run_django_admin(args,'settings')
-out
-err, 'ImportError: No module named regressiontests
+err
+out, 'CREATE TABLE
-
-    def test_builtin_with_bad_settings(self):
@@ -290 +290 @@
-
-    def test_custom_command(self):
-
+ unless settings are provided
-        args = ['noargs_command']
-        out, err = self.run_django_admin(args)
@@ -297 +297 @@
-
-    def test_custom_command_with_settings(self):
-'t execute user commands, even
+ execute user commands
-        args = ['noargs_command', '--settings=settings']
-        out, err = self.run_django_admin(args)
-out
-err, "Unknown command: 'noargs_command'
+err
+out, "EXECUTE:NoArgsCommand
-
-    def test_custom_command_with_environment(self):
-'t execute user commands, even
+ execute user commands
-        args = ['noargs_command']
-        out, err = self.run_django_admin(args,'settings')
-out
-err, "Unknown command: 'noargs_command'
+err
+out, "EXECUTE:NoArgsCommand
-
-class DjangoAdminMinimalSettings(AdminScriptTestCase):
@@ -356 +356 @@
-
-    def test_custom_command(self):
-
+ unless settings are provided
-        args = ['noargs_command']
-        out, err = self.run_django_admin(args)
@@ -421 +421 @@
-        self.assertOutput(err, "Could not import settings 'bad_settings'")
-
-
-
+ 
+ unless settings are provided
-        args = ['noargs_command']
-        out, err = self.run_django_admin(args)
@@ -429 +429 @@
-
-    def test_custom_command_with_settings(self):
-'t execute user commands, even
+ execute user commands
-        args = ['noargs_command', '--settings=alternate_settings']
-        out, err = self.run_django_admin(args)
-out
-err, "Unknown command: 'noargs_command'
+err
+out, "EXECUTE:NoArgsCommand
-
-    def test_custom_command_with_environment(self):
-'t execute user commands, even
+ execute user commands
-        args = ['noargs_command']
-        out, err = self.run_django_admin(args,'alternate_settings')
-out
-err, "Unknown command: 'noargs_command'
+err
+out, "EXECUTE:NoArgsCommand
-
-
@@ -491 +491 @@
-        self.assertOutput(err, "Could not import settings 'bad_settings'")
-
-
-
+ 
+ unless settings are provided
-        args = ['noargs_command']
-        out, err = self.run_django_admin(args)
@@ -502 +502 @@
-        args = ['noargs_command', '--settings=alternate_settings']
-        out, err = self.run_django_admin(args)
-out
-err, "Unknown command: 'noargs_command'
+err
+out, "EXECUTE:NoArgsCommand
-
-    def test_custom_command_with_environment(self):
@@ -509 +509 @@
-        args = ['noargs_command']
-        out, err = self.run_django_admin(args,'alternate_settings')
-out
-err, "Unknown command: 'noargs_command'
+err
+out, "EXECUTE:NoArgsCommand
-
-##########################################################################