Commit 9937943f authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[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
parent fb3f6294

tests/modeltests/model_package/tests.py

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ class Advertisment(models.Model): 
__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()

tests/regressiontests/urlpatterns_reverse/tests.py

+1 −2
Original line number Diff line number Diff line
@@ -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)