Django

Code

Show
Ignore:
Timestamp:
04/27/08 06:49:03 (9 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7478]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7435 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7477

  • django/branches/newforms-admin/django/db/__init__.py

    r6955 r7479  
    1212 
    1313try: 
    14     # Most of the time, the database backend will be one of the official  
     14    # Most of the time, the database backend will be one of the official 
    1515    # backends that ships with Django, so look there first. 
    1616    _import_path = 'django.db.backends.' 
    1717    backend = __import__('%s%s.base' % (_import_path, settings.DATABASE_ENGINE), {}, {}, ['']) 
     18    creation = __import__('%s%s.creation' % (_import_path, settings.DATABASE_ENGINE), {}, {}, ['']) 
    1819except ImportError, e: 
    19     # If the import failed, we might be looking for a database backend  
     20    # If the import failed, we might be looking for a database backend 
    2021    # distributed external to Django. So we'll try that next. 
    2122    try: 
    2223        _import_path = '' 
    2324        backend = __import__('%s.base' % settings.DATABASE_ENGINE, {}, {}, ['']) 
     25        creation = __import__('%s.creation' % settings.DATABASE_ENGINE, {}, {}, ['']) 
    2426    except ImportError, e_user: 
    2527        # The database backend wasn't found. Display a helpful error message 
    …… 
    3840    return __import__('%s%s.%s' % (import_path, settings.DATABASE_ENGINE, module_name), {}, {}, ['']) 
    3941 
    40 # We don't want to import the introspect/creation modules unless  
    41 # someone asks for 'em, so lazily load them on demmand. 
     42# We don't want to import the introspect module unless someone asks for it, so 
     43# lazily load it on demmand. 
    4244get_introspection_module = curry(_import_database_module, _import_path, 'introspection') 
    43 get_creation_module = curry(_import_database_module, _import_path, 'creation') 
     45 
     46def get_creation_module(): 
     47    return creation 
    4448 
    4549# We want runshell() to work the same way, but we have to treat it a