diff options
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() |