summaryrefslogtreecommitdiff
path: root/tests/regressiontests
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-10-08 17:54:40 +0000
committerJannis Leidel <jannis@leidel.info>2010-10-08 17:54:40 +0000
commit9937943f3a4d6f9e6e0121b41c22ec7ea64dc66c (patch)
treed9031ab34812127fec1a9a1b9b0b493274180dd7 /tests/regressiontests
parentfb3f629457117cb754208af68dc7f63b73f92e1b (diff)
[1.2.X] Fixed a few minor backporting oversights that prevented the tests to pass.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests')
-rw-r--r--tests/regressiontests/urlpatterns_reverse/tests.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py
index 5b691eafa3..d0b714644e 100644
--- a/tests/regressiontests/urlpatterns_reverse/tests.py
+++ b/tests/regressiontests/urlpatterns_reverse/tests.py
@@ -5,7 +5,7 @@ import unittest
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse, resolve, NoReverseMatch, Resolver404
+from django.core.urlresolvers import reverse, resolve, NoReverseMatch, Resolver404, RegexURLResolver
from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
from django.shortcuts import redirect
from django.test import TestCase
@@ -305,7 +305,6 @@ class ErrorHandlerResolutionTests(TestCase):
"""Tests for handler404 and handler500"""
def setUp(self):
- from django.core.urlresolvers import RegexURLResolver
urlconf = 'regressiontests.urlpatterns_reverse.urls_error_handlers'
urlconf_callables = 'regressiontests.urlpatterns_reverse.urls_error_handlers_callables'
self.resolver = RegexURLResolver(r'^$', urlconf)