Django

Code

Show
Ignore:
Timestamp:
06/30/08 10:38:16 (6 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573

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-7768 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-7808

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

    r7584 r7809  
    197197            try: 
    198198                res = func(*args, **kw) 
    199             except Exception, e: 
     199            except (Exception, KeyboardInterrupt, SystemExit): 
     200                # (We handle KeyboardInterrupt and SystemExit specially, since 
     201                # they don't inherit from Exception in Python 2.5, but we 
     202                # should treat them uniformly here.) 
    200203                if is_dirty(): 
    201204                    rollback()