newforms-admin: Merged changes from trunk up to [6863].

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6864 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 5 insertions, 4 deletions

diff --git a/django/core/handlers/modpython.py b/django/core/handlers/modpython.py
index e81a65be4d..ebf79295e0 100644
--- a/django/core/handlers/modpython.py
+++ b/django/core/handlers/modpython.py
@@ -1,11 +1,12 @@
-from django.core.handlers.base import BaseHandler
+import os
+from pprint import pformat
+
+from django import http
 from django.core import signals
+from django.core.handlers.base import BaseHandler
 from django.dispatch import dispatcher
 from django.utils import datastructures
 from django.utils.encoding import force_unicode
-from django import http
-from pprint import pformat
-import os
 
 # NOTE: do *not* import settings (or any module which eventually imports
 # settings) until after ModPythonHandler has been called; otherwise os.environ