Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214
  • django/branches/gis/django/views/debug.py

    r7979 r8215  
    146146            'name': origin.name, 
    147147        } 
    148         if hasattr(self.exc_value, 'exc_info') and self.exc_value.exc_info: 
    149             exc_type, exc_value, tb = self.exc_value.exc_info 
    150148 
    151149    def _get_lines_from_file(self, filename, lineno, context_lines, loader=None, module_name=None):