Changeset 7482 for django/branches/gis/django/db/__init__.py

Timestamp:

04/27/08 12:17:04 (9 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7458,7471-7473,7476-7478,7480 via svnmerge from trunk.

This includes all necessary patches for compatibility with queryset-refactor.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/db/__init__.py (modified) (2 diffs)

django/branches/gis/django/db/__init__.py

@@ -12 +12 @@
-
-try:
- 
+
-    # backends that ships with Django, so look there first.
-    _import_path = 'django.db.backends.'
-    backend = __import__('%s%s.base' % (_import_path, settings.DATABASE_ENGINE), {}, {}, [''])
+    creation = __import__('%s%s.creation' % (_import_path, settings.DATABASE_ENGINE), {}, {}, [''])
-except ImportError, e:
- 
+
-    # distributed external to Django. So we'll try that next.
-    try:
-        _import_path = ''
-        backend = __import__('%s.base' % settings.DATABASE_ENGINE, {}, {}, [''])
+        creation = __import__('%s.creation' % settings.DATABASE_ENGINE, {}, {}, [''])
-    except ImportError, e_user:
-        # The database backend wasn't found. Display a helpful error message
@@ -38 +40 @@
-    return __import__('%s%s.%s' % (import_path, settings.DATABASE_ENGINE, module_name), {}, {}, [''])
-
-/creation modules unless 
-someone asks for 'em, so lazily load them
+ module unless someone asks for it, so
+lazily load it
-get_introspection_module = curry(_import_database_module, _import_path, 'introspection')
-
+
+
+
-
-# We want runshell() to work the same way, but we have to treat it a