aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debug_toolbar/forms.py20
-rw-r--r--debug_toolbar/panels/sql.py2
-rw-r--r--debug_toolbar/panels/template.py11
-rw-r--r--debug_toolbar/urls.py6
-rw-r--r--debug_toolbar/utils/compat/__init__.py0
-rw-r--r--debug_toolbar/utils/compat/db.py13
-rw-r--r--debug_toolbar/utils/functional.py14
-rw-r--r--debug_toolbar/views.py30
-rw-r--r--tests/tests.py2
-rw-r--r--tests/urls.py8
10 files changed, 29 insertions, 77 deletions
diff --git a/debug_toolbar/forms.py b/debug_toolbar/forms.py
index f93abf7..c661c9e 100644
--- a/debug_toolbar/forms.py
+++ b/debug_toolbar/forms.py
@@ -1,23 +1,15 @@
+import json
+import hashlib
+
from django import forms
from django.conf import settings
+from django.db import connections
from django.utils.encoding import smart_str
+from django.utils.functional import cached_property
from django.core.exceptions import ValidationError
-from debug_toolbar.utils.functional import cached_property
from debug_toolbar.utils.sql import reformat_sql
-try:
- import json
-except ImportError:
- from django.utils import simplejson as json
-
-try:
- from hashlib import sha1
-except ImportError:
- from django.utils.hashcompat import sha_constructor as sha1
-
-from debug_toolbar.utils.compat.db import connections
-
class SQLSelectForm(forms.Form):
"""
@@ -83,7 +75,7 @@ class SQLSelectForm(forms.Form):
def make_hash(self, data):
params = settings.SECRET_KEY + data['sql'] + data['params']
- return sha1(smart_str(params)).hexdigest()
+ return hashlib.sha1(smart_str(params)).hexdigest()
@property
def connection(self):
diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 4bfdd27..4a0fc82 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -1,11 +1,11 @@
import uuid
from copy import copy
+from django.db import connections
from django.db.backends import BaseDatabaseWrapper
from django.utils.translation import ugettext_lazy as _, ungettext_lazy as __
from debug_toolbar.forms import SQLSelectForm
-from debug_toolbar.utils.compat.db import connections
from debug_toolbar.middleware import DebugToolbarMiddleware
from debug_toolbar.panels import DebugPanel
from debug_toolbar.utils import render_stacktrace
diff --git a/debug_toolbar/panels/template.py b/debug_toolbar/panels/template.py
index 390c1e1..7b01291 100644
--- a/debug_toolbar/panels/template.py
+++ b/debug_toolbar/panels/template.py
@@ -19,14 +19,9 @@ from debug_toolbar.utils.tracking.db import recording, SQLQueryTriggered
from django.test.utils import instrumented_test_render
from django.template import Template
-if not hasattr(Template, '_render'): # Django < 1.2
- if Template.render != instrumented_test_render:
- Template.original_render = Template.render
- Template.render = instrumented_test_render
-else:
- if Template._render != instrumented_test_render:
- Template.original_render = Template._render
- Template._render = instrumented_test_render
+if Template._render != instrumented_test_render:
+ Template.original_render = Template._render
+ Template._render = instrumented_test_render
# MONSTER monkey-patch
diff --git a/debug_toolbar/urls.py b/debug_toolbar/urls.py
index b37bf2d..4280a18 100644
--- a/debug_toolbar/urls.py
+++ b/debug_toolbar/urls.py
@@ -4,10 +4,8 @@ URLpatterns for the debug toolbar.
These should not be loaded explicitly; the debug toolbar middleware will patch
this into the urlconf for the request.
"""
-try:
- from django.conf.urls import patterns, url
-except ImportError: # django < 1.4
- from django.conf.urls.defaults import patterns, url
+
+from django.conf.urls import patterns, url
_PREFIX = '__debug__'
diff --git a/debug_toolbar/utils/compat/__init__.py b/debug_toolbar/utils/compat/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/debug_toolbar/utils/compat/__init__.py
+++ /dev/null
diff --git a/debug_toolbar/utils/compat/db.py b/debug_toolbar/utils/compat/db.py
deleted file mode 100644
index 6ff09ec..0000000
--- a/debug_toolbar/utils/compat/db.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from django.conf import settings
-try:
- from django.db import connections
- dbconf = settings.DATABASES
-except ImportError:
- # Compat with < Django 1.2
- from django.db import connection
- connections = {'default': connection}
- dbconf = {
- 'default': {
- 'ENGINE': settings.DATABASE_ENGINE,
- }
- }
diff --git a/debug_toolbar/utils/functional.py b/debug_toolbar/utils/functional.py
deleted file mode 100644
index 1dbb734..0000000
--- a/debug_toolbar/utils/functional.py
+++ /dev/null
@@ -1,14 +0,0 @@
-try:
- from django.utils.functional import cached_property
-except ImportError: # Django < 1.4
- class cached_property(object):
- """
- Decorator that creates converts a method with a single
- self argument into a property cached on the instance.
- """
- def __init__(self, func):
- self.func = func
-
- def __get__(self, instance, type):
- res = instance.__dict__[self.func.__name__] = self.func(instance)
- return res
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py
index 1445360..ab91cde 100644
--- a/debug_toolbar/views.py
+++ b/debug_toolbar/views.py
@@ -120,23 +120,19 @@ def template_source(request):
if template_name is None:
return HttpResponseBadRequest('"template" key is required')
- try: # Django 1.2 ...
- from django.template.loader import find_template_loader, make_origin
- loaders = []
- for loader_name in settings.TEMPLATE_LOADERS:
- loader = find_template_loader(loader_name)
- if loader is not None:
- loaders.append(loader)
- for loader in loaders:
- try:
- source, display_name = loader.load_template_source(template_name)
- origin = make_origin(display_name, loader, template_name, settings.TEMPLATE_DIRS)
- break
- except TemplateDoesNotExist:
- source = "Template Does Not Exist: %s" % (template_name,)
- except (ImportError, AttributeError): # Django 1.1 ...
- from django.template.loader import find_template_source
- source, origin = find_template_source(template_name)
+ from django.template.loader import find_template_loader, make_origin
+ loaders = []
+ for loader_name in settings.TEMPLATE_LOADERS:
+ loader = find_template_loader(loader_name)
+ if loader is not None:
+ loaders.append(loader)
+ for loader in loaders:
+ try:
+ source, display_name = loader.load_template_source(template_name)
+ origin = make_origin(display_name, loader, template_name, settings.TEMPLATE_DIRS)
+ break
+ except TemplateDoesNotExist:
+ source = "Template Does Not Exist: %s" % (template_name,)
try:
from pygments import highlight
diff --git a/tests/tests.py b/tests/tests.py
index fcb6c1e..4c6f246 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -159,7 +159,7 @@ class DebugToolbarTestCase(BaseTestCase):
def test_url_resolving_positional(self):
stats = self._resolve_stats('/resolving1/a/b/')
- self.assertEquals(stats['view_urlname'], 'positional-resolving') # Django >= 1.3
+ self.assertEquals(stats['view_urlname'], 'positional-resolving')
self.assertEquals(stats['view_func'], 'tests.views.resolving_view')
self.assertEquals(stats['view_args'], ('a', 'b'))
self.assertEquals(stats['view_kwargs'], {})
diff --git a/tests/urls.py b/tests/urls.py
index 778f417..326c61a 100644
--- a/tests/urls.py
+++ b/tests/urls.py
@@ -1,14 +1,12 @@
"""
-URLpatterns for the debug toolbar.
+URLpatterns for the debug toolbar.
These should not be loaded explicitly; the debug toolbar middleware will patch
this into the urlconf for the request.
"""
+
+from django.conf.urls import patterns, url
from django.contrib import admin
-try:
- from django.conf.urls import patterns, url
-except ImportError: # django < 1.4
- from django.conf.urls.defaults import patterns, url
admin.autodiscover()
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 11:16:42 +0000