From 77babde9e293a2c99c365a798a79c982a6de3be1 Mon Sep 17 00:00:00 2001 From: Jens Vagelpohl Date: Tue, 3 Sep 2024 14:41:42 +0000 Subject: [PATCH] fixup! - update to latest meta/config templates (#67) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jérome Perrin --- .pre-commit-config.yaml | 1 - src/DateTime/tests/test_datetime.py | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7fb56ff..8d0156c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,7 +20,6 @@ repos: rev: 0.4.3 hooks: - id: teyit - exclude: tests/test_datetime\.py - repo: https://github.com/PyCQA/flake8 rev: "7.1.1" hooks: diff --git a/src/DateTime/tests/test_datetime.py b/src/DateTime/tests/test_datetime.py index f4c2644..5b3f07d 100644 --- a/src/DateTime/tests/test_datetime.py +++ b/src/DateTime/tests/test_datetime.py @@ -77,7 +77,7 @@ def _compare(self, dt1, dt2): def testBug1203(self): # 01:59:60 occurred in old DateTime dt = DateTime(7200, 'GMT') - self.assertTrue(str(dt).find('60') < 0, dt) + self.assertNotIn('60', str(dt)) def testDSTInEffect(self): # Checks GMT offset for a DST date in the US/Eastern time zone @@ -172,7 +172,7 @@ def testOldDate(self): # Fails when an 1800 date is displayed with negative signs dt = DateTime('1830/5/6 12:31:46.213 pm') dt1 = dt.toZone('GMT+6') - self.assertTrue(str(dt1).find('-') < 0, (dt, dt1)) + self.assertNotIn('-', str(dt1)) def testSubtraction(self): # Reconstruction of a DateTime from its parts, with subtraction @@ -219,8 +219,10 @@ def test_compare_methods(self): self.assertFalse(dt.equalTo(dt1)) # Compare a date to float dt = DateTime(1.0) - self.assertTrue(dt == DateTime(1.0)) # testing __eq__ - self.assertFalse(dt != DateTime(1.0)) # testing __ne__ + is_eq = dt == DateTime(1.0) # testing __eq__ + self.assertTrue(is_eq) + is_neq = dt != DateTime(1.0) # testing __ne__ + self.assertFalse(is_neq) self.assertFalse(dt.greaterThan(1.0)) self.assertTrue(dt.greaterThanEqualTo(1.0)) self.assertFalse(dt.lessThan(1.0)) @@ -230,8 +232,10 @@ def test_compare_methods(self): # Compare a date to int dt = DateTime(1) self.assertEqual(dt, DateTime(1.0)) - self.assertTrue(dt == DateTime(1)) # testing __eq__ - self.assertFalse(dt != DateTime(1)) # testing __ne__ + is_eq = dt == DateTime(1) # testing __eq__ + self.assertTrue(is_eq) + is_neq = dt != DateTime(1) # testing __ne__ + self.assertFalse(is_neq) self.assertFalse(dt.greaterThan(1)) self.assertTrue(dt.greaterThanEqualTo(1)) self.assertFalse(dt.lessThan(1)) @@ -242,8 +246,10 @@ def test_compare_methods(self): # but behavior if consistent as when comparing, for example, an int # and a string. dt = DateTime("2023") - self.assertFalse(dt == "2023") # testing __eq__ - self.assertTrue(dt != "2023") # testing __ne__ + is_eq = dt == "2023" # testing __eq__ + self.assertFalse(is_eq) + is_neq = dt != "2023" # testing __ne__ + self.assertTrue(is_neq) self.assertRaises(TypeError, dt.greaterThan, "2023") self.assertRaises(TypeError, dt.greaterThanEqualTo, "2023") self.assertRaises(TypeError, dt.lessThan, "2023")