persiantools 4.0.0__tar.gz → 4.0.3__tar.gz

{persiantools-4.0.0/persiantools.egg-info → persiantools-4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: persiantools
-Version: 4.0.0
+Version: 4.0.3
 Summary: Jalali date and datetime with other tools
 Home-page: https://github.com/majiidd/persiantools
 Author: Majid Hajiloo

{persiantools-4.0.0 → persiantools-4.0.3}/persiantools/__init__.py

@@ -7,7 +7,7 @@
 
 __title__ = "persiantools"
 __url__ = "https://github.com/majiidd/persiantools"
-__version__ = "4.0.0"
+__version__ = "4.0.3"
 __build__ = __version__
 __author__ = "Majid Hajiloo"
 __author_email__ = "majid.hajiloo@gmail.com"

{persiantools-4.0.0 → persiantools-4.0.3}/persiantools/jdatetime.py

@@ -247,9 +247,10 @@ class JalaliDate:
         days %= 12053
         jalali_year += 4 * (days // 1461)
         days %= 1461
-        jalali_year += (days - 1) // 365
 
+        # Correct for the leap year case
         if days > 365:
+            jalali_year += (days - 1) // 365
             days = (days - 1) % 365
 
         # Determine the Jalali month and day
@@ -265,63 +266,54 @@ class JalaliDate:
 
     def to_gregorian(self):
         """based on jdf.scr.ir"""
+        year = self.year + 1595
         month = self.month
         day = self.day
-        year = self.year
 
-        # Determine the Gregorian year
-        gregorian_year = 621 if year <= 979 else 1600
-        year -= 0 if year <= 979 else 979
-
-        # Calculate the number of days
-        days_in_month = (month - 1) * 31 if month < 7 else ((month - 7) * 30) + 186
-        days = (365 * year) + (year // 33) * 8 + ((year % 33) + 3) // 4
-        days += 78 + day + days_in_month
+        # Calculate the total number of days
+        days = -355668 + (365 * year) + ((year // 33) * 8) + (((year % 33) + 3) // 4) + day
+        if month < 7:
+            days += (month - 1) * 31
+        else:
+            days += ((month - 7) * 30) + 186
 
-        gregorian_year += 400 * (days // 146097)
+        # Determine the Gregorian year
+        gregorian_year = 400 * (days // 146097)
         days %= 146097
 
         if days > 36524:
             days -= 1
             gregorian_year += 100 * (days // 36524)
             days %= 36524
-
             if days >= 365:
                 days += 1
 
         gregorian_year += 4 * (days // 1461)
         days %= 1461
-        gregorian_year += (days - 1) // 365
-
         if days > 365:
+            gregorian_year += (days - 1) // 365
             days = (days - 1) % 365
 
         gregorian_day = days + 1
 
+        # Handle leap years for February day count adjustment
+        if (gregorian_year % 4 == 0 and gregorian_year % 100 != 0) or (gregorian_year % 400 == 0):
+            feb_days = 29
+        else:
+            feb_days = 28
+
         # Days in each month of the Gregorian calendar
-        gregorian_days_in_month = [
-            0,
-            31,
-            29 if (gregorian_year % 4 == 0 and gregorian_year % 100 != 0) or gregorian_year % 400 == 0 else 28,
-            31,
-            30,
-            31,
-            30,
-            31,
-            31,
-            30,
-            31,
-            30,
-            31,
-        ]
+        gregorian_days_in_month = [0, 31, feb_days, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
 
         # Determine the Gregorian month
-        for _gregorian_month, g in enumerate(gregorian_days_in_month):
-            if gregorian_day <= g:
+        gregorian_month = 1
+        for days_in_month in gregorian_days_in_month[1:]:
+            if gregorian_day <= days_in_month:
                 break
-            gregorian_day -= g
+            gregorian_day -= days_in_month
+            gregorian_month += 1
 
-        return date(gregorian_year, _gregorian_month, gregorian_day)
+        return date(gregorian_year, gregorian_month, gregorian_day)
 
     @classmethod
     def today(cls):

{persiantools-4.0.0 → persiantools-4.0.3/persiantools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: persiantools
-Version: 4.0.0
+Version: 4.0.3
 Summary: Jalali date and datetime with other tools
 Home-page: https://github.com/majiidd/persiantools
 Author: Majid Hajiloo

{persiantools-4.0.0 → persiantools-4.0.3}/tests/test_jalalidate.py

@@ -14,8 +14,6 @@ class TestJalaliDate(TestCase):
         self.assertEqual(JalaliDate(1367, 2, 14).to_gregorian(), date(1988, 5, 4))
         self.assertEqual(JalaliDate(1395, 3, 21).to_gregorian(), date(2016, 6, 10))
         self.assertEqual(JalaliDate(1395, 12, 9).to_gregorian(), date(2017, 2, 27))
-        self.assertEqual(JalaliDate(1395, 12, 30).to_gregorian(), date(2017, 3, 20))
-        self.assertEqual(JalaliDate(1396, 1, 1).to_gregorian(), date(2017, 3, 21))
         self.assertEqual(JalaliDate(1400, 6, 31).to_gregorian(), date(2021, 9, 22))
         self.assertEqual(JalaliDate(1396, 7, 27).to_gregorian(), date(2017, 10, 19))
         self.assertEqual(JalaliDate(1397, 11, 29).to_gregorian(), date(2019, 2, 18))
@@ -23,6 +21,32 @@ class TestJalaliDate(TestCase):
         self.assertEqual(JalaliDate(1400, 4, 25).to_gregorian(), date(2021, 7, 16))
         self.assertEqual(JalaliDate(1400, 12, 20).to_gregorian(), date(2022, 3, 11))
         self.assertEqual(JalaliDate(1403, 1, 5).to_gregorian(), date(2024, 3, 24))
+        self.assertEqual(JalaliDate(1402, 10, 10).to_gregorian(), date(2023, 12, 31))
+        self.assertEqual(JalaliDate(1403, 10, 11).to_gregorian(), date(2024, 12, 31))
+        self.assertEqual(JalaliDate(1403, 2, 23).to_gregorian(), date(2024, 5, 12))
+        self.assertEqual(JalaliDate(1403, 4, 3).to_gregorian(), date(2024, 6, 23))
+
+        self.assertEqual(JalaliDate(1391, 12, 30).to_gregorian(), date(2013, 3, 20))
+        self.assertEqual(JalaliDate(1395, 12, 30).to_gregorian(), date(2017, 3, 20))
+        self.assertEqual(JalaliDate(1399, 12, 30).to_gregorian(), date(2021, 3, 20))
+        self.assertEqual(JalaliDate(1403, 12, 30).to_gregorian(), date(2025, 3, 20))
+
+        self.assertEqual(JalaliDate(1378, 10, 11).to_gregorian(), date(2000, 1, 1))
+        self.assertEqual(JalaliDate(1379, 10, 12).to_gregorian(), date(2001, 1, 1))
+        self.assertEqual(JalaliDate(1390, 10, 11).to_gregorian(), date(2012, 1, 1))
+        self.assertEqual(JalaliDate(1393, 10, 11).to_gregorian(), date(2015, 1, 1))
+        self.assertEqual(JalaliDate(1398, 10, 11).to_gregorian(), date(2020, 1, 1))
+        self.assertEqual(JalaliDate(1399, 10, 12).to_gregorian(), date(2021, 1, 1))
+        self.assertEqual(JalaliDate(1402, 10, 11).to_gregorian(), date(2024, 1, 1))
+        self.assertEqual(JalaliDate(1403, 10, 12).to_gregorian(), date(2025, 1, 1))
+
+        self.assertEqual(JalaliDate(1367, 1, 1).to_gregorian(), date(1988, 3, 21))
+        self.assertEqual(JalaliDate(1396, 1, 1).to_gregorian(), date(2017, 3, 21))
+        self.assertEqual(JalaliDate(1399, 1, 1).to_gregorian(), date(2020, 3, 20))
+        self.assertEqual(JalaliDate(1400, 1, 1).to_gregorian(), date(2021, 3, 21))
+        self.assertEqual(JalaliDate(1402, 1, 1).to_gregorian(), date(2023, 3, 21))
+        self.assertEqual(JalaliDate(1403, 1, 1).to_gregorian(), date(2024, 3, 20))
+        self.assertEqual(JalaliDate(1404, 1, 1).to_gregorian(), date(2025, 3, 21))
 
         self.assertEqual(JalaliDate.today().to_gregorian(), date.today())
 
@@ -33,6 +57,11 @@ class TestJalaliDate(TestCase):
         self.assertEqual(JalaliDate(date(2000, 1, 1)), JalaliDate(1378, 10, 11))
         self.assertEqual(JalaliDate(date(2017, 10, 19)), JalaliDate(1396, 7, 27))
         self.assertEqual(JalaliDate(date(2019, 2, 18)), JalaliDate(1397, 11, 29))
+        self.assertEqual(JalaliDate(date(2020, 3, 20)), JalaliDate(1399, 1, 1))
+        self.assertEqual(JalaliDate(date(2021, 3, 21)), JalaliDate(1400, 1, 1))
+        self.assertEqual(JalaliDate(date(2023, 3, 21)), JalaliDate(1402, 1, 1))
+        self.assertEqual(JalaliDate(date(2025, 1, 1)), JalaliDate(1403, 10, 12))
+
         self.assertEqual(JalaliDate.to_jalali(1990, 9, 23), JalaliDate(1369, 7, 1))
         self.assertEqual(JalaliDate.to_jalali(1990, 9, 23), JalaliDate(1369, 7, 1))
         self.assertEqual(JalaliDate.to_jalali(2013, 9, 16), JalaliDate(1392, 6, 25))
@@ -40,6 +69,28 @@ class TestJalaliDate(TestCase):
         self.assertEqual(JalaliDate.to_jalali(2021, 2, 11), JalaliDate(1399, 11, 23))
         self.assertEqual(JalaliDate.to_jalali(2021, 7, 16), JalaliDate(1400, 4, 25))
         self.assertEqual(JalaliDate.to_jalali(2024, 3, 24), JalaliDate(1403, 1, 5))
+        self.assertEqual(JalaliDate.to_jalali(2020, 3, 19), JalaliDate(1398, 12, 29))
+        self.assertEqual(JalaliDate.to_jalali(2023, 12, 31), JalaliDate(1402, 10, 10))
+        self.assertEqual(JalaliDate.to_jalali(2024, 12, 31), JalaliDate(1403, 10, 11))
+        self.assertEqual(JalaliDate.to_jalali(2024, 5, 12), JalaliDate(1403, 2, 23))
+        self.assertEqual(JalaliDate.to_jalali(2024, 6, 23), JalaliDate(1403, 4, 3))
+
+        self.assertEqual(JalaliDate.to_jalali(2021, 3, 20), JalaliDate(1399, 12, 30))
+        self.assertEqual(JalaliDate.to_jalali(2025, 3, 20), JalaliDate(1403, 12, 30))
+
+        self.assertEqual(JalaliDate.to_jalali(2000, 1, 1), JalaliDate(1378, 10, 11))
+        self.assertEqual(JalaliDate.to_jalali(2012, 1, 1), JalaliDate(1390, 10, 11))
+        self.assertEqual(JalaliDate.to_jalali(2013, 1, 1), JalaliDate(1391, 10, 12))
+        self.assertEqual(JalaliDate.to_jalali(2020, 1, 1), JalaliDate(1398, 10, 11))
+        self.assertEqual(JalaliDate.to_jalali(2024, 1, 1), JalaliDate(1402, 10, 11))
+        self.assertEqual(JalaliDate.to_jalali(2025, 1, 1), JalaliDate(1403, 10, 12))
+
+        self.assertEqual(JalaliDate.to_jalali(1988, 3, 21), JalaliDate(1367, 1, 1))
+        self.assertEqual(JalaliDate.to_jalali(2019, 3, 21), JalaliDate(1398, 1, 1))
+        self.assertEqual(JalaliDate.to_jalali(2020, 3, 20), JalaliDate(1399, 1, 1))
+        self.assertEqual(JalaliDate.to_jalali(2021, 3, 21), JalaliDate(1400, 1, 1))
+        self.assertEqual(JalaliDate.to_jalali(2024, 3, 20), JalaliDate(1403, 1, 1))
+        self.assertEqual(JalaliDate.to_jalali(2025, 3, 21), JalaliDate(1404, 1, 1))
 
         self.assertEqual(JalaliDate(date.today()), JalaliDate.today())
 
@@ -58,6 +109,7 @@ class TestJalaliDate(TestCase):
         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)
+        self.assertEqual(JalaliDate.check_date(1403, 4, 3), True)
         self.assertEqual(JalaliDate.check_date(1403, 12, 30), True)
 
     def test_completeday(self):
@@ -228,6 +280,7 @@ class TestJalaliDate(TestCase):
         self.assertEqual(JalaliDate(1397, 11, 29).week_of_year(), 49)
         self.assertEqual(JalaliDate(1399, 1, 2).week_of_year(), 2)
         self.assertEqual(JalaliDate(1403, 1, 5).week_of_year(), 2)
+        self.assertEqual(JalaliDate(1403, 4, 3).week_of_year(), 15)
 
         self.assertEqual(JalaliDate(1367, 2, 14).weekday(), 4)
         self.assertEqual(JalaliDate(1393, 1, 1).weekday(), 6)
@@ -240,6 +293,7 @@ class TestJalaliDate(TestCase):
         self.assertEqual(JalaliDate(1397, 1, 1).weekday(), 4)
         self.assertEqual(JalaliDate(1397, 11, 29).weekday(), 2)
         self.assertEqual(JalaliDate(1400, 1, 1).weekday(), 1)
+        self.assertEqual(JalaliDate(1403, 4, 3).isoweekday(), 2)
         self.assertEqual(JalaliDate(1400, 1, 1).isoweekday(), 2)
         self.assertEqual(JalaliDate(1396, 7, 27).isoweekday(), 6)
         self.assertEqual(JalaliDate(1397, 11, 29).isoweekday(), 3)
@@ -260,6 +314,8 @@ class TestJalaliDate(TestCase):
         self.assertTrue(JalaliDate(1367, 2, 14) <= date(1988, 5, 4))
         self.assertFalse(JalaliDate(1367, 2, 14) >= JalaliDate(1369, 1, 1))
         self.assertTrue(JalaliDate(1397, 11, 29) >= JalaliDate(1397, 11, 10))
+        self.assertTrue(JalaliDate(1403, 12, 30) > JalaliDate(1403, 12, 29))
+        self.assertTrue(JalaliDate(1404, 1, 1) > JalaliDate(1403, 12, 30))
 
         self.assertEqual(JalaliDate(1395, 3, 21) + timedelta(days=2), JalaliDate(1395, 3, 23))
         self.assertEqual(JalaliDate(1396, 7, 27) + timedelta(days=4), JalaliDate(1396, 8, 1))
@@ -271,6 +327,7 @@ class TestJalaliDate(TestCase):
         self.assertEqual(JalaliDate(1395, 3, 21) - date(2016, 5, 3), timedelta(days=38))
         self.assertEqual(JalaliDate(1395, 12, 30) - JalaliDate(1395, 1, 1), timedelta(days=365))
         self.assertEqual(JalaliDate(1403, 1, 1) - JalaliDate(1402, 12, 29), timedelta(days=1))
+        self.assertEqual(JalaliDate(1404, 1, 1) - JalaliDate(1403, 12, 29), timedelta(days=2))
 
         self.assertFalse(JalaliDate(1367, 2, 14) == (1367, 2, 14))
         self.assertFalse(JalaliDate(1367, 2, 14) == "")

{persiantools-4.0.0 → persiantools-4.0.3}/tests/test_jalalidatetime.py

@@ -22,6 +22,10 @@ class TestJalaliDateTime(TestCase):
             JalaliDateTime(1399, 11, 23, 13, 12, 0, 0).to_gregorian(),
             datetime(2021, 2, 11, 13, 12, 0, 0),
         )
+        self.assertEqual(
+            JalaliDateTime(1404, 1, 1, 13, 12, 0, 0).to_gregorian(),
+            datetime(2025, 3, 21, 13, 12, 0, 0),
+        )
 
     def test_gregorian_to_shamsi(self):
         self.assertEqual(