Upgrade unittest asserts

Author: hugovk

src/pytz/tests/test_lazy.py

@@ -62,8 +62,8 @@ def test_binary_ops(self):
         self.assertEqual(3 * self.lazy, 3 * self.base)
 
         # Contains
-        self.assertTrue(2 in self.lazy)
-        self.assertFalse(42 in self.lazy)
+        self.assertIn(2, self.lazy)
+        self.assertNotIn(42, self.lazy)
 
     def test_iadd(self):
         self.lazy += [1]
@@ -79,8 +79,8 @@ def test_hash(self):
         self.assertRaises(TypeError, hash, self.lazy)
 
     def test_isinstance(self):
-        self.assertTrue(isinstance(self.lazy, list))
-        self.assertFalse(isinstance(self.lazy, tuple))
+        self.assertIsInstance(self.lazy, list)
+        self.assertNotIsInstance(self.lazy, tuple)
 
     def test_callable(self):
         try:
@@ -231,8 +231,8 @@ def test_binary_ops(self):
                 op(self.base, self.base), str(op))
 
         # Contains
-        self.assertTrue(2 in self.lazy)
-        self.assertFalse(42 in self.lazy)
+        self.assertIn(2, self.lazy)
+        self.assertNotIn(42, self.lazy)
 
     def test_iops(self):
         try:
@@ -256,7 +256,7 @@ def test_hash(self):
         self.assertRaises(TypeError, hash, self.lazy)
 
     def test_isinstance(self):
-        self.assertTrue(isinstance(self.lazy, set))
+        self.assertIsInstance(self.lazy, set)
 
     def test_callable(self):
         try:

src/pytz/tests/test_tzinfo.py

@@ -83,16 +83,16 @@ def testVersion(self):
 
     def testGMT(self):
         now = datetime.now(tz=GMT)
-        self.assertTrue(now.utcoffset() == NOTIME)
-        self.assertTrue(now.dst() == NOTIME)
-        self.assertTrue(now.timetuple() == now.utctimetuple())
-        self.assertTrue(now == now.replace(tzinfo=UTC))
+        self.assertEqual(now.utcoffset(), NOTIME)
+        self.assertEqual(now.dst(), NOTIME)
+        self.assertEqual(now.timetuple(), now.utctimetuple())
+        self.assertEqual(now, now.replace(tzinfo=UTC))
 
     def testReferenceUTC(self):
         now = datetime.now(tz=UTC)
-        self.assertTrue(now.utcoffset() == NOTIME)
-        self.assertTrue(now.dst() == NOTIME)
-        self.assertTrue(now.timetuple() == now.utctimetuple())
+        self.assertEqual(now.utcoffset(), NOTIME)
+        self.assertEqual(now.dst(), NOTIME)
+        self.assertEqual(now.timetuple(), now.utctimetuple())
 
     def testUnknownOffsets(self):
         # This tzinfo behavior is required to make
@@ -102,8 +102,8 @@ def testUnknownOffsets(self):
 
         # This information is not known when we don't have a date,
         # so return None per API.
-        self.assertTrue(dst_tz.utcoffset(None) is None)
-        self.assertTrue(dst_tz.dst(None) is None)
+        self.assertIsNone(dst_tz.utcoffset(None))
+        self.assertIsNone(dst_tz.dst(None))
         # We don't know the abbreviation, but this is still a valid
         # tzname per the Python documentation.
         self.assertEqual(dst_tz.tzname(None), 'US/Eastern')
@@ -117,25 +117,25 @@ def testUnicodeTimezone(self):
         # returned.
         self.clearCache()
         eastern = pytz.timezone(unicode('US/Eastern'))
-        self.assertTrue(eastern is pytz.timezone('US/Eastern'))
+        self.assertIs(eastern, pytz.timezone('US/Eastern'))
 
         self.clearCache()
         eastern = pytz.timezone('US/Eastern')
-        self.assertTrue(eastern is pytz.timezone(unicode('US/Eastern')))
+        self.assertIs(eastern, pytz.timezone(unicode('US/Eastern')))
 
     def testStaticTzInfo(self):
         # Ensure that static timezones are correctly detected,
         # per lp:1602807
         static = pytz.timezone('Etc/GMT-4')
-        self.assertTrue(isinstance(static, StaticTzInfo))
+        self.assertIsInstance(static, StaticTzInfo)
 
 
 class PicklingTest(unittest.TestCase):
 
     def _roundtrip_tzinfo(self, tz):
         p = pickle.dumps(tz)
         unpickled_tz = pickle.loads(p)
-        self.assertTrue(tz is unpickled_tz, '%s did not roundtrip' % tz.zone)
+        self.assertIs(tz, unpickled_tz, '%s did not roundtrip' % tz.zone)
 
     def _roundtrip_datetime(self, dt):
         # Ensure that the tzinfo attached to a datetime instance
@@ -145,7 +145,7 @@ def _roundtrip_datetime(self, dt):
         p = pickle.dumps(dt)
         unpickled_dt = pickle.loads(p)
         unpickled_tz = unpickled_dt.tzinfo
-        self.assertTrue(tz is unpickled_tz, '%s did not roundtrip' % tz.zone)
+        self.assertIs(tz, unpickled_tz, '%s did not roundtrip' % tz.zone)
 
     def testDst(self):
         tz = pytz.timezone('Europe/Amsterdam')
@@ -173,7 +173,7 @@ def testDatabaseFixes(self):
         )
         self.assertNotEqual(p, hacked_p)
         unpickled_tz = pickle.loads(hacked_p)
-        self.assertTrue(tz is unpickled_tz)
+        self.assertIs(tz, unpickled_tz)
 
         # Simulate a database correction. In this case, the incorrect
         # data will continue to be used.
@@ -196,7 +196,7 @@ def testDatabaseFixes(self):
         self.assertNotEqual(p, hacked_p)
         unpickled_tz = pickle.loads(hacked_p)
         self.assertEqual(unpickled_tz._utcoffset.seconds, new_utcoffset)
-        self.assertTrue(tz is not unpickled_tz)
+        self.assertIsNot(tz, unpickled_tz)
 
     def testOldPickles(self):
         # Ensure that applications serializing pytz instances as pickles
@@ -210,7 +210,7 @@ def testOldPickles(self):
         )
         east2 = pytz.timezone('US/Eastern').localize(
             datetime(2006, 1, 1)).tzinfo
-        self.assertTrue(east1 is east2)
+        self.assertIs(east1, east2)
 
         # Confirm changes in name munging between 2006j and 2007c cause
         # no problems.
@@ -219,12 +219,12 @@ def testOldPickles(self):
             "\np2\nI-17340\nI0\nS'PPMT'\np3\ntRp4\n."))
         pap2 = pytz.timezone('America/Port-au-Prince').localize(
             datetime(1910, 1, 1)).tzinfo
-        self.assertTrue(pap1 is pap2)
+        self.assertIs(pap1, pap2)
 
         gmt1 = pickle.loads(_byte_string(
             "cpytz\n_p\np1\n(S'Etc/GMT_plus_10'\np2\ntRp3\n."))
         gmt2 = pytz.timezone('Etc/GMT+10')
-        self.assertTrue(gmt1 is gmt2)
+        self.assertIs(gmt1, gmt2)
 
 
 class USEasternDSTStartTestCase(unittest.TestCase):
@@ -703,17 +703,17 @@ def test_bratislava(self):
         # but I'm hesitant to pay the startup cost as loading the list
         # on demand whilst remaining backwards compatible seems
         # difficult.
-        self.assertTrue('Europe/Bratislava' in pytz.common_timezones)
-        self.assertTrue('Europe/Bratislava' in pytz.common_timezones_set)
+        self.assertIn('Europe/Bratislava', pytz.common_timezones)
+        self.assertIn('Europe/Bratislava', pytz.common_timezones_set)
 
     def test_us_eastern(self):
-        self.assertTrue('US/Eastern' in pytz.common_timezones)
-        self.assertTrue('US/Eastern' in pytz.common_timezones_set)
+        self.assertIn('US/Eastern', pytz.common_timezones)
+        self.assertIn('US/Eastern', pytz.common_timezones_set)
 
     def test_belfast(self):
-        self.assertTrue('Europe/Belfast' in pytz.all_timezones_set)
-        self.assertFalse('Europe/Belfast' in pytz.common_timezones)
-        self.assertFalse('Europe/Belfast' in pytz.common_timezones_set)
+        self.assertIn('Europe/Belfast', pytz.all_timezones_set)
+        self.assertNotIn('Europe/Belfast', pytz.common_timezones)
+        self.assertNotIn('Europe/Belfast', pytz.common_timezones_set)
 
 
 class ZoneCaseInsensitivityTestCase(unittest.TestCase):
@@ -737,7 +737,7 @@ class BaseTzInfoTestCase:
     tz_class = None  # override
 
     def test_expectedclass(self):
-        self.assertTrue(isinstance(self.tz, self.tz_class))
+        self.assertIsInstance(self.tz, self.tz_class)
 
     def test_fromutc(self):
         # naive datetime.
@@ -755,33 +755,33 @@ def test_fromutc(self):
 
         # localized datetime, different timezone.
         new_tz = pytz.timezone('Europe/Paris')
-        self.assertTrue(self.tz is not new_tz)
+        self.assertIsNot(self.tz, new_tz)
         dt3 = new_tz.localize(dt1)
         self.assertRaises(ValueError, self.tz.fromutc, dt3)
 
     def test_normalize(self):
         other_tz = pytz.timezone('Europe/Paris')
-        self.assertTrue(self.tz is not other_tz)
+        self.assertIsNot(self.tz, other_tz)
 
         dt = datetime(2012, 3, 26, 12, 0)
         other_dt = other_tz.localize(dt)
 
         local_dt = self.tz.normalize(other_dt)
 
-        self.assertTrue(local_dt.tzinfo is not other_dt.tzinfo)
+        self.assertIsNot(local_dt.tzinfo, other_dt.tzinfo)
         self.assertNotEqual(
             local_dt.replace(tzinfo=None), other_dt.replace(tzinfo=None))
 
     def test_astimezone(self):
         other_tz = pytz.timezone('Europe/Paris')
-        self.assertTrue(self.tz is not other_tz)
+        self.assertIsNot(self.tz, other_tz)
 
         dt = datetime(2012, 3, 26, 12, 0)
         other_dt = other_tz.localize(dt)
 
         local_dt = other_dt.astimezone(self.tz)
 
-        self.assertTrue(local_dt.tzinfo is not other_dt.tzinfo)
+        self.assertIsNot(local_dt.tzinfo, other_dt.tzinfo)
         self.assertNotEqual(
             local_dt.replace(tzinfo=None), other_dt.replace(tzinfo=None))
 

test_zdump.py

@@ -14,14 +14,16 @@
 class ZdumpTestCase(unittest.TestCase):
     def utc_to_local_check(self, zone, utc_dt, loc_dt, loc_tzname, is_dst):
         loc_tz = pytz.timezone(zone)
-        self.failUnlessEqual(
+        self.assertEqual(
             utc_dt.astimezone(loc_tz).replace(tzinfo=None),
-            loc_dt.replace(tzinfo=None))
+            loc_dt.replace(tzinfo=None)
+        )
 
     def local_to_utc_check(self, zone, utc_dt, loc_dt, loc_tzname, is_dst):
-        self.failUnlessEqual(
+        self.assertEqual(
             loc_dt.astimezone(pytz.utc).replace(tzinfo=None),
-            utc_dt.replace(tzinfo=None))
+            utc_dt.replace(tzinfo=None)
+        )
 
 
 def test_suite():
@@ -134,5 +136,6 @@ def test_local_to_utc(
         suite.addTest(unittest.makeSuite(testcases.pop()))
     return suite
 
+
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')