Skip to content
Browse files

[1.2.X] Fixed a few minor backporting oversights that prevented the t…

…ests to pass.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent fb3f629 commit 9937943f3a4d6f9e6e0121b41c22ec7ea64dc66c @jezdez jezdez committed
Showing with 1 addition and 3 deletions.
  1. +0 −1 tests/modeltests/model_package/tests.py
  2. +1 −2 tests/regressiontests/urlpatterns_reverse/tests.py
View
1 tests/modeltests/model_package/tests.py
@@ -10,7 +10,6 @@ class Meta:
__test__ = {'API_TESTS': """
>>> from models.publication import Publication
>>> from models.article import Article
->>> from django.contrib.auth.views import Site
>>> p = Publication(title="FooBar")
>>> p.save()
View
3 tests/regressiontests/urlpatterns_reverse/tests.py
@@ -5,7 +5,7 @@
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)

0 comments on commit 9937943

Please sign in to comment.
Something went wrong with that request. Please try again.