Django

Code

Show
Ignore:
Timestamp:
07/04/08 15:16:22 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7772-7808,7811-7814,7816-7823,7826-7829,7831-7833,7835 via svnmerge from trunk. Modified GeoWhereNode accordingly for changes in r7835.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7767 to /django/trunk:1-7835

  • django/branches/gis/django/db/transaction.py

    r7573 r7836  
    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()