Commit 8e1226b4 authored by Alex Gaynor's avatar Alex Gaynor
Browse files

Kill some more dead code. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 345c4c46

django/core/handlers/base.py

+4 −4
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ class BaseHandler(object): 
                        try:

                            response = self.handle_uncaught_exception(request, resolver, sys.exc_info())

                        finally:

                            receivers = signals.got_request_exception.send(sender=self.__class__, request=request)

                            signals.got_request_exception.send(sender=self.__class__, request=request)

            except exceptions.PermissionDenied:

                logger.warning(

                    'Forbidden (Permission denied): %s' % request.path,
@@ -168,14 +168,14 @@ class BaseHandler(object): 
                        response = self.handle_uncaught_exception(request,

                            resolver, sys.exc_info())

                    finally:

                        receivers = signals.got_request_exception.send(

                        signals.got_request_exception.send(

                            sender=self.__class__, request=request)

            except SystemExit:

                # Allow sys.exit() to actually exit. See tickets #1023 and #4701

                raise

            except: # Handle everything else, including SuspiciousOperation, etc.

                # Get the exception info now, in case another exception is thrown later.

                receivers = signals.got_request_exception.send(sender=self.__class__, request=request)

                signals.got_request_exception.send(sender=self.__class__, request=request)

                response = self.handle_uncaught_exception(request, resolver, sys.exc_info())

        finally:

            # Reset URLconf for this thread on the way out for complete
@@ -188,7 +188,7 @@ class BaseHandler(object): 
                response = middleware_method(request, response)

            response = self.apply_response_fixes(request, response)

        except: # Any exception should be gathered and handled

            receivers = signals.got_request_exception.send(sender=self.__class__, request=request)

            signals.got_request_exception.send(sender=self.__class__, request=request)

            response = self.handle_uncaught_exception(request, resolver, sys.exc_info())



        return response

django/core/management/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ def setup_environ(settings_mod, original_settings_path=None): 
    # Import the project module. We add the parent directory to PYTHONPATH to

    # avoid some of the path errors new users can have.

    sys.path.append(os.path.join(project_directory, os.pardir))

    project_module = import_module(project_name)

    import_module(project_name)

    sys.path.pop()



    return project_directory

django/core/management/commands/dumpdata.py

+2 −3
Original line number Diff line number Diff line 
from django.core.exceptions import ImproperlyConfigured

from django.core.management.base import BaseCommand, CommandError

from django.core import serializers

from django.db import connections, router, DEFAULT_DB_ALIAS

from django.db import router, DEFAULT_DB_ALIAS

from django.utils.datastructures import SortedDict



from optparse import make_option
@@ -28,12 +28,11 @@ class Command(BaseCommand): 
    args = '[appname appname.ModelName ...]'



    def handle(self, *app_labels, **options):

        from django.db.models import get_app, get_apps, get_models, get_model

        from django.db.models import get_app, get_apps, get_model



        format = options.get('format','json')

        indent = options.get('indent',None)

        using = options.get('database', DEFAULT_DB_ALIAS)

        connection = connections[using]

        excludes = options.get('exclude',[])

        show_traceback = options.get('traceback', False)

        use_natural_keys = options.get('use_natural_keys', False)

django/core/management/commands/shell.py

+7 −7
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ class Command(NoArgsCommand): 
        # XXX: (Temporary) workaround for ticket #1796: force early loading of all

        # models from installed apps.

        from django.db.models.loading import get_models

        loaded_models = get_models()

        get_models()



        use_plain = options.get('plain', False)

django/core/management/sql.py

+0 −1
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ def sql_custom(app, style, connection): 
    output = []



    app_models = get_models(app)

    app_dir = os.path.normpath(os.path.join(os.path.dirname(app.__file__), 'sql'))



    for model in app_models:

        output.extend(custom_sql_for_model(model, style, connection))