diff options
| author | Jannis Leidel | 2012-11-26 07:42:01 -0800 |
|---|---|---|
| committer | Jannis Leidel | 2012-11-26 07:42:01 -0800 |
| commit | 1ca18c6cb9edc79215d6f4476691e28d661b7b31 (patch) | |
| tree | 3a52b8cc46fbec59f4669679ed6d12ed1bbf15f4 /debug_toolbar/views.py | |
| parent | 28f64e3093b8880a97737a85feffa26f2f02f0ec (diff) | |
| parent | dc62f8175f5b63285628694f67185b51afe626e8 (diff) | |
| download | django-debug-toolbar-1ca18c6cb9edc79215d6f4476691e28d661b7b31.tar.bz2 | |
Merge pull request #336 from craigds/master
fix hashcompat deprecation warnings with django 1.5
Diffstat (limited to 'debug_toolbar/views.py')
| -rw-r--r-- | debug_toolbar/views.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py index be917ff..a642541 100644 --- a/debug_toolbar/views.py +++ b/debug_toolbar/views.py @@ -10,10 +10,14 @@ from django.conf import settings from django.http import HttpResponseBadRequest from django.shortcuts import render_to_response from django.utils import simplejson -from django.utils.hashcompat import sha_constructor from debug_toolbar.utils.compat.db import connections +try: + from hashlib import sha1 +except ImportError: + from django.utils.hashcompat import sha_constructor as sha1 + class InvalidSQLError(Exception): def __init__(self, value): @@ -37,7 +41,7 @@ def sql_select(request): sql = request.GET.get('sql', '') params = request.GET.get('params', '') alias = request.GET.get('alias', 'default') - hash = sha_constructor(settings.SECRET_KEY + sql + params).hexdigest() + hash = sha1(settings.SECRET_KEY + sql + params).hexdigest() if hash != request.GET.get('hash', ''): return HttpResponseBadRequest('Tamper alert') # SQL Tampering alert if sql.lower().strip().startswith('select'): @@ -72,7 +76,7 @@ def sql_explain(request): sql = request.GET.get('sql', '') params = request.GET.get('params', '') alias = request.GET.get('alias', 'default') - hash = sha_constructor(settings.SECRET_KEY + sql + params).hexdigest() + hash = sha1(settings.SECRET_KEY + sql + params).hexdigest() if hash != request.GET.get('hash', ''): return HttpResponseBadRequest('Tamper alert') # SQL Tampering alert if sql.lower().strip().startswith('select'): @@ -118,7 +122,7 @@ def sql_profile(request): sql = request.GET.get('sql', '') params = request.GET.get('params', '') alias = request.GET.get('alias', 'default') - hash = sha_constructor(settings.SECRET_KEY + sql + params).hexdigest() + hash = sha1(settings.SECRET_KEY + sql + params).hexdigest() if hash != request.GET.get('hash', ''): return HttpResponseBadRequest('Tamper alert') # SQL Tampering alert if sql.lower().strip().startswith('select'): |