summaryrefslogtreecommitdiff
path: root/tests/regressiontests/utils
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2012-05-03 11:54:51 -0300
committerRamiro Morales <cramm0@gmail.com>2012-05-03 11:54:51 -0300
commitc0395dea46231b20a97c884d4f22fc8e9dbdde66 (patch)
treebba360a8d3327a793ee81de87cdb90989d036780 /tests/regressiontests/utils
parent1adc87cd324db6003ef2962e68e11ccc9b104658 (diff)
parentb52672d77822e88752cb178c8a359adde83ff0ba (diff)
Merge branch 'master' of github.com:django/django
Diffstat (limited to 'tests/regressiontests/utils')
-rw-r--r--tests/regressiontests/utils/feedgenerator.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/regressiontests/utils/feedgenerator.py b/tests/regressiontests/utils/feedgenerator.py
index 3990896f12..4f1d07852c 100644
--- a/tests/regressiontests/utils/feedgenerator.py
+++ b/tests/regressiontests/utils/feedgenerator.py
@@ -100,12 +100,12 @@ class FeedgeneratorTest(unittest.TestCase):
def test_feed_without_feed_url_gets_rendered_without_atom_link(self):
feed = feedgenerator.Rss201rev2Feed('title', '/link/', 'descr')
- self.assertEquals(feed.feed['feed_url'], None)
+ self.assertEqual(feed.feed['feed_url'], None)
feed_content = feed.writeString('utf-8')
self.assertNotIn('<atom:link href=', feed_content)
def test_feed_with_feed_url_gets_rendered_with_atom_link(self):
feed = feedgenerator.Rss201rev2Feed('title', '/link/', 'descr', feed_url='/feed/')
- self.assertEquals(feed.feed['feed_url'], '/feed/')
+ self.assertEqual(feed.feed['feed_url'], '/feed/')
feed_content = feed.writeString('utf-8')
self.assertIn('<atom:link href="/feed/" rel="self"></atom:link>', feed_content)