← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal

« back to all changes in this revision

Viewing changes to django/core/management/__init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2010-10-12 11:34:35 UTC
  • mfrom: (1.1.12 upstream) (29.1.1 maverick-security)
  • Revision ID: james.westby@ubuntu.com-20101012113435-yy57c8tx6g9anf3e
Tags: 1.2.3-1ubuntu0.1
* SECURITY UPDATE: XSS in CSRF protections. New upstream release
  - CVE-2010-3082
* debian/patches/01_disable_url_verify_regression_tests.diff:
  - updated to disable another test that fails without internet connection
  - patch based on work by Kai Kasurinen and Krzysztof Klimonda
* debian/control: don't Build-Depends on locales-all, which doesn't exist
  in maverick

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/core/management/__init__.py
250
250
        """
251
251
        try:
252
252
            app_name = get_commands()[subcommand]
253
 
            if isinstance(app_name, BaseCommand):
254
 
                # If the command is already loaded, use it directly.
255
 
                klass = app_name
256
 
            else:
257
 
                klass = load_command_class(app_name, subcommand)
258
253
        except KeyError:
259
254
            sys.stderr.write("Unknown command: %r\nType '%s help' for usage.\n" % \
260
255
                (subcommand, self.prog_name))
261
256
            sys.exit(1)
 
257
        if isinstance(app_name, BaseCommand):
 
258
            # If the command is already loaded, use it directly.
 
259
            klass = app_name
 
260
        else:
 
261
            klass = load_command_class(app_name, subcommand)
262
262
        return klass
263
263
 
264
264
    def autocomplete(self):