diff options
| author | Craig de Stigter | 2012-11-21 12:52:42 +1300 |
|---|---|---|
| committer | Craig de Stigter | 2012-11-21 12:52:42 +1300 |
| commit | dc62f8175f5b63285628694f67185b51afe626e8 (patch) | |
| tree | fd5083cd3a2d74fa455f1fb9be58a4a7b55e6b5f /debug_toolbar/utils/tracking | |
| parent | aeb45f2fea083fb182f5fd33e7c4980780b1ea81 (diff) | |
| download | django-debug-toolbar-dc62f8175f5b63285628694f67185b51afe626e8.tar.bz2 | |
fix hashcompat deprecation warnings with django 1.5
Diffstat (limited to 'debug_toolbar/utils/tracking')
| -rw-r--r-- | debug_toolbar/utils/tracking/db.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/debug_toolbar/utils/tracking/db.py b/debug_toolbar/utils/tracking/db.py index 4d87090..e9c7ce9 100644 --- a/debug_toolbar/utils/tracking/db.py +++ b/debug_toolbar/utils/tracking/db.py @@ -7,11 +7,16 @@ from django.conf import settings from django.template import Node from django.utils import simplejson from django.utils.encoding import force_unicode, smart_str -from django.utils.hashcompat import sha_constructor from debug_toolbar.utils import ms_from_timedelta, tidy_stacktrace, \ get_template_info, get_stack from debug_toolbar.utils.compat.db import connections + +try: + from hashlib import sha1 +except ImportError: + from django.utils.hashcompat import sha_constructor as sha1 + # TODO:This should be set in the toolbar loader as a default and panels should # get a copy of the toolbar object with access to its config dictionary SQL_WARNING_THRESHOLD = getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}) \ @@ -134,7 +139,7 @@ class NormalCursorWrapper(object): 'duration': duration, 'raw_sql': sql, 'params': _params, - 'hash': sha_constructor(settings.SECRET_KEY \ + 'hash': sha1(settings.SECRET_KEY \ + smart_str(sql) \ + _params).hexdigest(), 'stacktrace': stacktrace, |
