Django

Code

Show
Ignore:
Timestamp:
07/17/08 15:12:21 (6 months ago)
Author:
brosner
Message:

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

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-7936 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-7943
  • django/branches/newforms-admin/django/test/utils.py

    r6955 r7944  
    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)