[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
This commit is contained in:
parent
fb3f629457
commit
9937943f3a
@ -10,7 +10,6 @@ class Advertisment(models.Model):
|
|||||||
__test__ = {'API_TESTS': """
|
__test__ = {'API_TESTS': """
|
||||||
>>> from models.publication import Publication
|
>>> from models.publication import Publication
|
||||||
>>> from models.article import Article
|
>>> from models.article import Article
|
||||||
>>> from django.contrib.auth.views import Site
|
|
||||||
|
|
||||||
>>> p = Publication(title="FooBar")
|
>>> p = Publication(title="FooBar")
|
||||||
>>> p.save()
|
>>> p.save()
|
||||||
|
@ -5,7 +5,7 @@ import unittest
|
|||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core.exceptions import ImproperlyConfigured
|
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.http import HttpResponseRedirect, HttpResponsePermanentRedirect
|
||||||
from django.shortcuts import redirect
|
from django.shortcuts import redirect
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
@ -305,7 +305,6 @@ class ErrorHandlerResolutionTests(TestCase):
|
|||||||
"""Tests for handler404 and handler500"""
|
"""Tests for handler404 and handler500"""
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
from django.core.urlresolvers import RegexURLResolver
|
|
||||||
urlconf = 'regressiontests.urlpatterns_reverse.urls_error_handlers'
|
urlconf = 'regressiontests.urlpatterns_reverse.urls_error_handlers'
|
||||||
urlconf_callables = 'regressiontests.urlpatterns_reverse.urls_error_handlers_callables'
|
urlconf_callables = 'regressiontests.urlpatterns_reverse.urls_error_handlers_callables'
|
||||||
self.resolver = RegexURLResolver(r'^$', urlconf)
|
self.resolver = RegexURLResolver(r'^$', urlconf)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user