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

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

AUTHORS

@@ -131,6 +131,7 @@ answer newbie questions, and generally made Django that much better:
     Matthew Flanagan <http://wadofstuff.blogspot.com>
     Eric Floehr <eric@intellovations.com>
     Vincent Foley <vfoleybourgon@yahoo.ca>
+    Rudolph Froger <rfroger@estrate.nl>
     Jorge Gajon <gajon@gajon.org>
     gandalf@owca.info
     Marc Garcia <marc.garcia@accopensys.com>
@@ -306,6 +307,7 @@ answer newbie questions, and generally made Django that much better:
     Georgi Stanojevski <glisha@gmail.com>
     Vasiliy Stavenko <stavenko@gmail.com>
     Thomas Steinacher <http://www.eggdrop.ch/>
+    Johan C. Stöver <johan@nilling.nl>
     nowell strite
     Thomas Stromberg <tstromberg@google.com>
     Sundance
@@ -333,6 +335,7 @@ answer newbie questions, and generally made Django that much better:
     tt@gurgle.no
     Amit Upadhyay
     Geert Vanderkelen
+    I.S. van Oostveen <v.oostveen@idca.nl>
     viestards.lists@gmail.com
     George Vilches <gav@thataddress.com>
     Vlado <vlado@labath.org>

django/conf/__init__.py

@@ -52,7 +52,9 @@ def _import_settings(self):
             if not settings_module: # If it's set but is an empty string.
                 raise KeyError
         except KeyError:
-            raise ImportError, "Environment variable %s is undefined so settings cannot be imported." % ENVIRONMENT_VARIABLE   # NOTE: This is arguably an EnvironmentError, but that causes problems with Python's interactive help
+            # NOTE: This is arguably an EnvironmentError, but that causes
+            # problems with Python's interactive help.
+            raise ImportError("Settings cannot be imported, because environment variable %s is undefined." % ENVIRONMENT_VARIABLE)
 
         self._target = Settings(settings_module)