summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-05-07 17:05:06 +0000
committerJannis Leidel <jannis@leidel.info>2011-05-07 17:05:06 +0000
commit32bd953e632ffaf6c1d4f8514600986e729ecb66 (patch)
tree44cccc3d77b6d4c584f78fecfce4e683089e1c30 /django
parent2abd7af4ddd4d4cc83d2e3a52da1c76b10cd5a31 (diff)
Minor renaming for consistency.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/contrib/flatpages/tests/middleware.py8
-rw-r--r--django/contrib/flatpages/tests/views.py6
2 files changed, 7 insertions, 7 deletions
diff --git a/django/contrib/flatpages/tests/middleware.py b/django/contrib/flatpages/tests/middleware.py
index 01a9b355d7..57433a5028 100644
--- a/django/contrib/flatpages/tests/middleware.py
+++ b/django/contrib/flatpages/tests/middleware.py
@@ -82,7 +82,7 @@ class FlatpageMiddlewareTests(TestCase):
fp.sites.add(1)
response = self.client.get('/some.very_special~chars-here/')
- self.assertEquals(response.status_code, 200)
+ self.assertEqual(response.status_code, 200)
self.assertContains(response, "<p>Isn't it special!</p>")
@@ -121,7 +121,7 @@ class FlatpageMiddlewareAppendSlashTests(TestCase):
def test_redirect_view_non_existent_flatpage(self):
"A non-existent flatpage raises 404 when served through a view and should not add a slash"
response = self.client.get('/flatpage_root/no_such_flatpage')
- self.assertEquals(response.status_code, 404)
+ self.assertEqual(response.status_code, 404)
def test_redirect_fallback_flatpage(self):
"A flatpage can be served by the fallback middlware and should add a slash"
@@ -131,7 +131,7 @@ class FlatpageMiddlewareAppendSlashTests(TestCase):
def test_redirect_fallback_non_existent_flatpage(self):
"A non-existent flatpage raises a 404 when served by the fallback middlware and should not add a slash"
response = self.client.get('/no_such_flatpage')
- self.assertEquals(response.status_code, 404)
+ self.assertEqual(response.status_code, 404)
def test_redirect_fallback_flatpage_special_chars(self):
"A flatpage with special chars in the URL can be served by the fallback middleware and should add a slash"
@@ -159,7 +159,7 @@ class FlatpageMiddlewareAppendSlashTests(TestCase):
fp.sites.add(1)
response = self.client.get('/')
- self.assertEquals(response.status_code, 200)
+ self.assertEqual(response.status_code, 200)
self.assertContains(response, "<p>Root</p>")
diff --git a/django/contrib/flatpages/tests/views.py b/django/contrib/flatpages/tests/views.py
index 54ab52ab7e..8bc7544170 100644
--- a/django/contrib/flatpages/tests/views.py
+++ b/django/contrib/flatpages/tests/views.py
@@ -110,17 +110,17 @@ class FlatpageViewAppendSlashTests(TestCase):
def test_redirect_view_non_existent_flatpage(self):
"A non-existent flatpage raises 404 when served through a view and should not add a slash"
response = self.client.get('/flatpage_root/no_such_flatpage')
- self.assertEquals(response.status_code, 404)
+ self.assertEqual(response.status_code, 404)
def test_redirect_fallback_flatpage(self):
"A fallback flatpage won't be served if the middleware is disabled and should not add a slash"
response = self.client.get('/flatpage')
- self.assertEquals(response.status_code, 404)
+ self.assertEqual(response.status_code, 404)
def test_redirect_fallback_non_existent_flatpage(self):
"A non-existent flatpage won't be served if the fallback middlware is disabled and should not add a slash"
response = self.client.get('/no_such_flatpage')
- self.assertEquals(response.status_code, 404)
+ self.assertEqual(response.status_code, 404)
def test_redirect_view_flatpage_special_chars(self):
"A flatpage with special chars in the URL can be served through a view and should add a slash"