sqlalchemy: Merged revisions 3918 to 4053 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/sqlalchemy@4054 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Author: Robin Munn

AUTHORS

@@ -83,13 +83,15 @@ answer newbie questions, and generally made Django that much better:
     Simon Greenhill <[email protected]>
     Espen Grindhaug <http://grindhaug.org/>
     Brant Harris
+    Hawkeye
     [email protected]
     Joel Heenan <[email protected]>
     [email protected]
     Ian Holsman <http://feh.holsman.net/>
     Kieran Holland <http://www.kieranholland.com>
     Robert Rock Howard <http://djangomojo.com/>
     Jason Huggins <http://www.jrandolph.com/blog/>
+	Baurzhan Ismagulov <[email protected]>
     [email protected]
     Michael Josephson <http://www.sdjournal.com/>
     [email protected]
@@ -105,17 +107,19 @@ answer newbie questions, and generally made Django that much better:
     [email protected]
     Stuart Langridge <http://www.kryogenix.org/>
     Eugene Lazutkin <http://lazutkin.com/blog/>
-    Jeong-Min Lee
+    Jeong-Min Lee <[email protected]>
     Christopher Lenz <http://www.cmlenz.net/>
     [email protected]
     limodou
     mattmcc
     Martin Maney <http://www.chipy.org/Martin_Maney>
+    [email protected]
     Manuzhai
     Petar Marić
     [email protected]
     [email protected]
     Jason McBrayer <http://www.carcosa.net/jason/>
+    [email protected]
     [email protected]
     mmarshall
     Eric Moritz <http://eric.themoritzfamily.com/>
@@ -157,6 +161,7 @@ answer newbie questions, and generally made Django that much better:
     Amit Upadhyay
     Geert Vanderkelen
     Milton Waddams
+    [email protected]
     Dan Watson <http://theidioteque.net/>
     Rachel Willmer <http://www.willmer.com/kb/>
     Gary Wilson <[email protected]>

django/conf/__init__.py

@@ -77,7 +77,7 @@ def __init__(self, settings_module):
         self.SETTINGS_MODULE = settings_module
 
         try:
-            mod = __import__(self.SETTINGS_MODULE, '', '', [''])
+            mod = __import__(self.SETTINGS_MODULE, {}, {}, [''])
         except ImportError, e:
             raise EnvironmentError, "Could not import settings '%s' (Is it on sys.path? Does it have syntax errors?): %s" % (self.SETTINGS_MODULE, e)
 
@@ -97,7 +97,7 @@ def __init__(self, settings_module):
         new_installed_apps = []
         for app in self.INSTALLED_APPS:
             if app.endswith('.*'):
-                appdir = os.path.dirname(__import__(app[:-2], '', '', ['']).__file__)
+                appdir = os.path.dirname(__import__(app[:-2], {}, {}, ['']).__file__)
                 for d in os.listdir(appdir):
                     if d.isalpha() and os.path.isdir(os.path.join(appdir, d)):
                         new_installed_apps.append('%s.%s' % (app[:-2], d))

django/conf/global_settings.py

@@ -101,6 +101,7 @@
 DATABASE_PASSWORD = ''         # Not used with sqlite3.
 DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+DATABASE_OPTIONS = {}          # Set to empty dictionary for default.
 
 # Host for sending e-mail.
 EMAIL_HOST = 'localhost'
@@ -228,6 +229,10 @@
 # Hint: you really don't!
 TRANSACTIONS_MANAGED = False
 
+# The User-Agent string to use when checking for URL validity through the
+# isExistingURL validator.
+URL_VALIDATOR_USER_AGENT = "Django/0.96pre (http://www.djangoproject.com)"
+
 ##############
 # MIDDLEWARE #
 ##############