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/middleware/common.py

    r7768 r8215  
    1 import md5 
    21import re 
    32 
    …… 
    76from django.utils.http import urlquote 
    87from django.core import urlresolvers 
     8from django.utils.hashcompat import md5_constructor 
    99 
    1010class CommonMiddleware(object): 
    …… 
    2222              appending a slash at the end. If this new URL is found in 
    2323              urlpatterns, then an HTTP-redirect is returned to this new URL; 
    24               otherwise the initial URL is processed as usual.  
     24              otherwise the initial URL is processed as usual. 
    2525 
    2626        - ETags: If the USE_ETAGS setting is set, ETags will be calculated from 
    …… 
    109109                etag = response['ETag'] 
    110110            else: 
    111                 etag = '"%s"' % md5.new(response.content).hexdigest() 
     111                etag = '"%s"' % md5_constructor(response.content).hexdigest() 
    112112            if response.status_code >= 200 and response.status_code < 300 and request.META.get('HTTP_IF_NONE_MATCH') == etag: 
    113113                cookies = response.cookies