Django

Code

Show
Ignore:
Timestamp:
07/19/08 08:30:47 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk.

This includes the newforms-admin branch, and thus is backwards-incompatible. The geographic admin is _not_ in this changeset, and is forthcoming.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7917 to /django/trunk:1-7978

  • django/branches/gis/django/test/utils.py

    r6990 r7979  
    7575    "Make sure a connection is in autocommit mode." 
    7676    if hasattr(connection.connection, "autocommit"): 
    77         connection.connection.autocommit(True) 
     77        if callable(connection.connection.autocommit): 
     78            connection.connection.autocommit(True) 
     79        else: 
     80            connection.connection.autocommit = True 
    7881    elif hasattr(connection.connection, "set_isolation_level"): 
    7982        connection.connection.set_isolation_level(0) 
    …… 
    138141            'postgresql_psycopg2': get_postgresql_create_suffix, 
    139142            'mysql': get_mysql_create_suffix, 
    140             'mysql_old': get_mysql_create_suffix, 
    141143        }.get(settings.DATABASE_ENGINE, lambda: '')() 
    142144        if settings.TEST_DATABASE_NAME: