Updated test assertions that have been deprecated by the move to unittest2. In summary, this means:

 assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 45 insertions, 45 deletions

diff --git a/tests/regressiontests/utils/dateformat.py b/tests/regressiontests/utils/dateformat.py
index e785eec724..b678fa0093 100644
--- a/tests/regressiontests/utils/dateformat.py
+++ b/tests/regressiontests/utils/dateformat.py
@@ -33,82 +33,82 @@ class DateFormatTests(unittest.TestCase):
 
     def test_date(self):
         d = date(2009, 5, 16)
-        self.assertEquals(date.fromtimestamp(int(format(d, 'U'))), d)
+        self.assertEqual(date.fromtimestamp(int(format(d, 'U'))), d)
 
     def test_naive_datetime(self):
         dt = datetime(2009, 5, 16, 5, 30, 30)
-        self.assertEquals(datetime.fromtimestamp(int(format(dt, 'U'))), dt)
+        self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U'))), dt)
 
     def test_datetime_with_local_tzinfo(self):
         ltz = LocalTimezone(datetime.now())
         dt = datetime(2009, 5, 16, 5, 30, 30, tzinfo=ltz)
-        self.assertEquals(datetime.fromtimestamp(int(format(dt, 'U')), ltz), dt)
-        self.assertEquals(datetime.fromtimestamp(int(format(dt, 'U'))), dt.replace(tzinfo=None))
+        self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U')), ltz), dt)
+        self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U'))), dt.replace(tzinfo=None))
 
     def test_datetime_with_tzinfo(self):
         tz = FixedOffset(-510)
         ltz = LocalTimezone(datetime.now())
         dt = datetime(2009, 5, 16, 5, 30, 30, tzinfo=tz)
-        self.assertEquals(datetime.fromtimestamp(int(format(dt, 'U')), tz), dt)
-        self.assertEquals(datetime.fromtimestamp(int(format(dt, 'U')), ltz), dt)
-        self.assertEquals(datetime.fromtimestamp(int(format(dt, 'U'))), dt.astimezone(ltz).replace(tzinfo=None))
-        self.assertEquals(datetime.fromtimestamp(int(format(dt, 'U')), tz).utctimetuple(), dt.utctimetuple())
-        self.assertEquals(datetime.fromtimestamp(int(format(dt, 'U')), ltz).utctimetuple(), dt.utctimetuple())
+        self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U')), tz), dt)
+        self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U')), ltz), dt)
+        self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U'))), dt.astimezone(ltz).replace(tzinfo=None))
+        self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U')), tz).utctimetuple(), dt.utctimetuple())
+        self.assertEqual(datetime.fromtimestamp(int(format(dt, 'U')), ltz).utctimetuple(), dt.utctimetuple())
 
     def test_epoch(self):
         utc = FixedOffset(0)
         udt = datetime(1970, 1, 1, tzinfo=utc)
-        self.assertEquals(format(udt, 'U'), u'0')
+        self.assertEqual(format(udt, 'U'), u'0')
 
     def test_empty_format(self):
         my_birthday = datetime(1979, 7, 8, 22, 00)
 
-        self.assertEquals(dateformat.format(my_birthday, ''), u'')
+        self.assertEqual(dateformat.format(my_birthday, ''), u'')
 
     def test_am_pm(self):
         my_birthday = datetime(1979, 7, 8, 22, 00)
 
-        self.assertEquals(dateformat.format(my_birthday, 'a'), u'p.m.')
+        self.assertEqual(dateformat.format(my_birthday, 'a'), u'p.m.')
 
     def test_date_formats(self):
         my_birthday = datetime(1979, 7, 8, 22, 00)
         timestamp = datetime(2008, 5, 19, 11, 45, 23, 123456)
 
-        self.assertEquals(dateformat.format(my_birthday, 'A'), u'PM')
-        self.assertEquals(dateformat.format(timestamp, 'c'), u'2008-05-19T11:45:23.123456')
-        self.assertEquals(dateformat.format(my_birthday, 'd'), u'08')
-        self.assertEquals(dateformat.format(my_birthday, 'j'), u'8')
-        self.assertEquals(dateformat.format(my_birthday, 'l'), u'Sunday')
-        self.assertEquals(dateformat.format(my_birthday, 'L'), u'False')
-        self.assertEquals(dateformat.format(my_birthday, 'm'), u'07')
-        self.assertEquals(dateformat.format(my_birthday, 'M'), u'Jul')
-        self.assertEquals(dateformat.format(my_birthday, 'b'), u'jul')
-        self.assertEquals(dateformat.format(my_birthday, 'n'), u'7')
-        self.assertEquals(dateformat.format(my_birthday, 'N'), u'July')
+        self.assertEqual(dateformat.format(my_birthday, 'A'), u'PM')
+        self.assertEqual(dateformat.format(timestamp, 'c'), u'2008-05-19T11:45:23.123456')
+        self.assertEqual(dateformat.format(my_birthday, 'd'), u'08')
+        self.assertEqual(dateformat.format(my_birthday, 'j'), u'8')
+        self.assertEqual(dateformat.format(my_birthday, 'l'), u'Sunday')
+        self.assertEqual(dateformat.format(my_birthday, 'L'), u'False')
+        self.assertEqual(dateformat.format(my_birthday, 'm'), u'07')
+        self.assertEqual(dateformat.format(my_birthday, 'M'), u'Jul')
+        self.assertEqual(dateformat.format(my_birthday, 'b'), u'jul')
+        self.assertEqual(dateformat.format(my_birthday, 'n'), u'7')
+        self.assertEqual(dateformat.format(my_birthday, 'N'), u'July')
 
     def test_time_formats(self):
         my_birthday = datetime(1979, 7, 8, 22, 00)
 
-        self.assertEquals(dateformat.format(my_birthday, 'P'), u'10 p.m.')
-        self.assertEquals(dateformat.format(my_birthday, 's'), u'00')
-        self.assertEquals(dateformat.format(my_birthday, 'S'), u'th')
-        self.assertEquals(dateformat.format(my_birthday, 't'), u'31')
-        self.assertEquals(dateformat.format(my_birthday, 'w'), u'0')
-        self.assertEquals(dateformat.format(my_birthday, 'W'), u'27')
-        self.assertEquals(dateformat.format(my_birthday, 'y'), u'79')
-        self.assertEquals(dateformat.format(my_birthday, 'Y'), u'1979')
-        self.assertEquals(dateformat.format(my_birthday, 'z'), u'189')
+        self.assertEqual(dateformat.format(my_birthday, 'P'), u'10 p.m.')
+        self.assertEqual(dateformat.format(my_birthday, 's'), u'00')
+        self.assertEqual(dateformat.format(my_birthday, 'S'), u'th')
+        self.assertEqual(dateformat.format(my_birthday, 't'), u'31')
+        self.assertEqual(dateformat.format(my_birthday, 'w'), u'0')
+        self.assertEqual(dateformat.format(my_birthday, 'W'), u'27')
+        self.assertEqual(dateformat.format(my_birthday, 'y'), u'79')
+        self.assertEqual(dateformat.format(my_birthday, 'Y'), u'1979')
+        self.assertEqual(dateformat.format(my_birthday, 'z'), u'189')
 
     def test_dateformat(self):
         my_birthday = datetime(1979, 7, 8, 22, 00)
 
-        self.assertEquals(dateformat.format(my_birthday, r'Y z \C\E\T'), u'1979 189 CET')
+        self.assertEqual(dateformat.format(my_birthday, r'Y z \C\E\T'), u'1979 189 CET')
 
-        self.assertEquals(dateformat.format(my_birthday, r'jS o\f F'), u'8th of July')
+        self.assertEqual(dateformat.format(my_birthday, r'jS o\f F'), u'8th of July')
 
     def test_futuredates(self):
         the_future = datetime(2100, 10, 25, 0, 00)
-        self.assertEquals(dateformat.format(the_future, r'Y'), u'2100')
+        self.assertEqual(dateformat.format(the_future, r'Y'), u'2100')
 
     def test_timezones(self):
         my_birthday = datetime(1979, 7, 8, 22, 00)
@@ -117,13 +117,13 @@ class DateFormatTests(unittest.TestCase):
         timestamp = datetime(2008, 5, 19, 11, 45, 23, 123456)
 
         if self.tz_tests:
-            self.assertEquals(dateformat.format(my_birthday, 'O'), u'+0100')
-            self.assertEquals(dateformat.format(my_birthday, 'r'), u'Sun, 8 Jul 1979 22:00:00 +0100')
-            self.assertEquals(dateformat.format(my_birthday, 'T'), u'CET')
-            self.assertEquals(dateformat.format(my_birthday, 'U'), u'300315600')
-            self.assertEquals(dateformat.format(timestamp, 'u'), u'123456')
-            self.assertEquals(dateformat.format(my_birthday, 'Z'), u'3600')
-            self.assertEquals(dateformat.format(summertime, 'I'), u'1')
-            self.assertEquals(dateformat.format(summertime, 'O'), u'+0200')
-            self.assertEquals(dateformat.format(wintertime, 'I'), u'0')
-            self.assertEquals(dateformat.format(wintertime, 'O'), u'+0100')
+            self.assertEqual(dateformat.format(my_birthday, 'O'), u'+0100')
+            self.assertEqual(dateformat.format(my_birthday, 'r'), u'Sun, 8 Jul 1979 22:00:00 +0100')
+            self.assertEqual(dateformat.format(my_birthday, 'T'), u'CET')
+            self.assertEqual(dateformat.format(my_birthday, 'U'), u'300315600')
+            self.assertEqual(dateformat.format(timestamp, 'u'), u'123456')
+            self.assertEqual(dateformat.format(my_birthday, 'Z'), u'3600')
+            self.assertEqual(dateformat.format(summertime, 'I'), u'1')
+            self.assertEqual(dateformat.format(summertime, 'O'), u'+0200')
+            self.assertEqual(dateformat.format(wintertime, 'I'), u'0')
+            self.assertEqual(dateformat.format(wintertime, 'O'), u'+0100')