Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (4 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): 

  • django/branches/gis/django/views/generic/create_update.py

    r7979 r8215  
    1616    """ 
    1717    if follow is not None: 
    18         import warning 
     18        import warnings 
    1919        msg = ("Generic views have been changed to use newforms, and the" 
    20                "'follow' argument is no longer used.  Please update your code" 
    21                "to not use the 'follow' argument.") 
    22         warning.warn(msg, DeprecationWarning, stacklevel=3) 
     20               " 'follow' argument is no longer used.  Please update your code" 
     21               " to not use the 'follow' argument.") 
     22        warnings.warn(msg, DeprecationWarning, stacklevel=3) 
    2323 
    2424def apply_extra_context(extra_context, context): 

  • django/branches/gis/django/views/generic/simple.py

    r6394 r8215  
    1 from django.shortcuts import render_to_response 
    21from django.template import loader, RequestContext 
    32from django.http import HttpResponse, HttpResponsePermanentRedirect, HttpResponseGone