Merge branch 'master' into develop

majiidd · Mar 24, 2024 · b6152a4 · b6152a4
2 parents 7a3f4f5 + 5e11173
commit b6152a4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/persiantools/jdatetime.py b/persiantools/jdatetime.py
@@ -181,7 +181,7 @@ def _check_date_fields(cls, year, month, day, locale):
         return year, month, day, locale
 
     @classmethod
-    def chack_date(cls, year, month, day):
+    def check_date(cls, year, month, day):
         try:
             cls._check_date_fields(year, month, day, "en")
         except (ValueError, TypeError):
@@ -1100,7 +1100,7 @@ def strftime(self, fmt, locale=None):
     def __base_compare(self, other):
         assert isinstance(other, JalaliDateTime)
 
-        y, m, d, h, m, s, ms = [
+        y, mo, d, h, m, s, ms = [
             self._year,
             self._month,
             self._day,
@@ -1109,7 +1109,7 @@ def __base_compare(self, other):
             self._second,
             self._microsecond,
         ]
-        y2, m2, d2, h2, m2, s2, ms2 = [
+        y2, mo2, d2, h2, m2, s2, ms2 = [
             other.year,
             other.month,
             other.day,
@@ -1121,8 +1121,8 @@ def __base_compare(self, other):
 
         return (
             0
-            if (y, m, d, h, m, s, ms) == (y2, m2, d2, h2, m2, s2, ms2)
-            else 1 if (y, m, d, h, m, s, ms) > (y2, m2, d2, h2, m2, s2, ms2) else -1
+            if (y, mo, d, h, m, s, ms) == (y2, mo2, d2, h2, m2, s2, ms2)
+            else 1 if (y, mo, d, h, m, s, ms) > (y2, mo2, d2, h2, m2, s2, ms2) else -1
         )
 
     def _cmp(self, other, allow_mixed=False):

diff --git a/tests/test_jalalidate.py b/tests/test_jalalidate.py
@@ -42,21 +42,21 @@ def test_gregorian_to_shamsi(self):
 
         self.assertEqual(JalaliDate(date.today()), JalaliDate.today())
 
-    def test_chackdate(self):
-        self.assertEqual(JalaliDate.chack_date(1367, 2, 14), True)
-        self.assertEqual(JalaliDate.chack_date(1395, 12, 30), True)
-        self.assertEqual(JalaliDate.chack_date(1394, 12, 30), False)
-        self.assertEqual(JalaliDate.chack_date(13, 13, 30), False)
-        self.assertEqual(JalaliDate.chack_date(0, 0, 0), False)
-        self.assertEqual(JalaliDate.chack_date(9378, 0, 0), False)
-        self.assertEqual(JalaliDate.chack_date("1300", "1", "1"), False)
-        self.assertEqual(JalaliDate.chack_date(1396, 12, 30), False)
-        self.assertEqual(JalaliDate.chack_date(1397, 7, 1), True)
-        self.assertEqual(JalaliDate.chack_date(1396, 7, 27), True)
-        self.assertEqual(JalaliDate.chack_date(1397, 11, 29), True)
-        self.assertEqual(JalaliDate.chack_date(1399, 11, 31), False)
-        self.assertEqual(JalaliDate.chack_date(1400, 4, 25), True)
-        self.assertEqual(JalaliDate.chack_date(1400, 12, 30), False)
+    def test_checkdate(self):
+        self.assertEqual(JalaliDate.check_date(1367, 2, 14), True)
+        self.assertEqual(JalaliDate.check_date(1395, 12, 30), True)
+        self.assertEqual(JalaliDate.check_date(1394, 12, 30), False)
+        self.assertEqual(JalaliDate.check_date(13, 13, 30), False)
+        self.assertEqual(JalaliDate.check_date(0, 0, 0), False)
+        self.assertEqual(JalaliDate.check_date(9378, 0, 0), False)
+        self.assertEqual(JalaliDate.check_date("1300", "1", "1"), False)
+        self.assertEqual(JalaliDate.check_date(1396, 12, 30), False)
+        self.assertEqual(JalaliDate.check_date(1397, 7, 1), True)
+        self.assertEqual(JalaliDate.check_date(1396, 7, 27), True)
+        self.assertEqual(JalaliDate.check_date(1397, 11, 29), True)
+        self.assertEqual(JalaliDate.check_date(1399, 11, 31), False)
+        self.assertEqual(JalaliDate.check_date(1400, 4, 25), True)
+        self.assertEqual(JalaliDate.check_date(1400, 12, 30), False)
 
     def test_completeday(self):
         jdate = JalaliDate(1398, 3, 17)

diff --git a/tests/test_jalalidatetime.py b/tests/test_jalalidatetime.py
@@ -168,6 +168,7 @@ def test_operators(self):
         self.assertTrue(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) != JalaliDate(1367, 5, 5))
         self.assertTrue(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) < JalaliDateTime(1369, 7, 1, 1, 0, 0, 0))
         self.assertFalse(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) < datetime(1988, 5, 4, 4, 30, 0, 0))
+        self.assertTrue(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) < JalaliDateTime(1367, 3, 14, 4, 30, 0, 0))
         self.assertTrue(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) <= JalaliDateTime(1369, 7, 1, 1, 0, 0, 0))
         self.assertTrue(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) <= datetime(1988, 5, 4, 4, 30, 0, 100))
         self.assertFalse(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) > JalaliDateTime(1369, 7, 1, 1, 0, 0, 0))