diff options
| author | Aymeric Augustin | 2013-10-16 22:14:41 +0200 |
|---|---|---|
| committer | Aymeric Augustin | 2013-10-17 18:24:57 +0200 |
| commit | c1f39b1a168d535e0b90d3c69273e391adf22637 (patch) | |
| tree | 9ae12cb257585e4681edea253209d9c150f3731a /tests | |
| parent | 79831e4053b472921621f288483e95a961a4d142 (diff) | |
| download | django-debug-toolbar-c1f39b1a168d535e0b90d3c69273e391adf22637.tar.bz2 | |
Remove compatibility code for unsupported version of Django.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/tests.py | 2 | ||||
| -rw-r--r-- | tests/urls.py | 8 |
2 files changed, 4 insertions, 6 deletions
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() |
