persiantools 5.3.0__tar.gz → 5.4.0__tar.gz

{persiantools-5.3.0/persiantools.egg-info → persiantools-5.4.0}/PKG-INFO

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: persiantools
-Version: 5.3.0
+Version: 5.4.0
 Summary: Jalali date and datetime with other tools
 Home-page: https://github.com/majiidd/persiantools
 Author: Majid Hajiloo
 Author-email: majid.hajiloo@gmail.com
 License: MIT
+Project-URL: Source, https://github.com/majiidd/persiantools
+Project-URL: Issues, https://github.com/majiidd/persiantools/issues
 Keywords: jalali shamsi persian digits characters converter jalalidate jalalidatetime date datetime jdate jdatetime farsi
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: Persian
@@ -27,7 +29,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pytz
+Requires-Dist: tzdata; platform_system == "Windows"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -37,6 +39,7 @@ Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
 Dynamic: license-file
+Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -147,15 +150,15 @@ The `JalaliDateTime` object represents a date and time in the Jalali calendar.
 
 ```python
 >>> from persiantools.jdatetime import JalaliDateTime
->>> import datetime, pytz
+>>> import datetime
 
 # Current Jalali datetime
 >>> JalaliDateTime.now()
 JalaliDateTime(1404, 3, 16, 2, 17, 14, 907909)
 
-# Current Jalali datetime (timezone-aware)
->>> JalaliDateTime.now(pytz.timezone("Asia/Tehran"))
-JalaliDateTime(1404, 3, 16, 2, 17, 14, 907909, tzinfo=<DstTzInfo 'Asia/Tehran' +0330+3:30:00 STD>)
+>>> from zoneinfo import ZoneInfo
+>>> JalaliDateTime.now(ZoneInfo("Asia/Tehran"))
+JalaliDateTime(1404, 3, 16, 2, 17, 14, 907909, tzinfo=zoneinfo.ZoneInfo(key='Asia/Tehran'))
 
 # Current UTC Jalali datetime
 >>> JalaliDateTime.utcnow()
@@ -175,20 +178,21 @@ JalaliDateTime(1367, 2, 14, 14, 30, 15)
 JalaliDateTime(1400, 1, 1, 15, 30, 0, 10)
 
 # Timezone conversion
->>> tehran_tz = pytz.timezone("Asia/Tehran")
->>> utc_tz = pytz.utc
+>>> from zoneinfo import ZoneInfo
+>>> tehran_tz = ZoneInfo("Asia/Tehran")
+>>> utc_tz = datetime.timezone.utc
 >>> dt_utc = JalaliDateTime.now(utc_tz)
 >>> dt_tehran = dt_utc.astimezone(tehran_tz)
 >>> dt_utc
-JalaliDateTime(1404, 3, 15, 22, 54, 8, 835877, tzinfo=<UTC>)
+JalaliDateTime(1404, 3, 15, 22, 54, 8, 835877, tzinfo=datetime.timezone.utc)
 >>> dt_tehran
-JalaliDateTime(1404, 3, 16, 2, 24, 8, 835877, tzinfo=<DstTzInfo 'Asia/Tehran' +0330+3:30:00 STD>)
+JalaliDateTime(1404, 3, 16, 2, 24, 8, 835877, tzinfo=zoneinfo.ZoneInfo(key='Asia/Tehran'))
 ```
 
 #### Attributes and Methods
 
 ```python
->>> dt_obj = JalaliDateTime(1367, 2, 14, 14, 30, 15, 123, tzinfo=pytz.utc)
+>>> dt_obj = JalaliDateTime(1367, 2, 14, 14, 30, 15, 123, tzinfo=datetime.timezone.utc)
 
 >>> dt_obj.year
 1367
@@ -205,7 +209,7 @@ JalaliDateTime(1404, 3, 16, 2, 24, 8, 835877, tzinfo=<DstTzInfo 'Asia/Tehran' +0
 >>> dt_obj.microsecond
 123
 >>> dt_obj.tzinfo
-<UTC>
+datetime.timezone.utc
 
 # Date part as datetime.date (Gregorian)
 >>> dt_obj.date()
@@ -226,9 +230,9 @@ Based on python `strftime()` behavior
 
 ```python
 >>> from persiantools.jdatetime import JalaliDateTime
->>> import pytz
+>>> from zoneinfo import ZoneInfo
 
->>> dt = JalaliDateTime(1367, 2, 14, 14, 30, 0, tzinfo=pytz.timezone("Asia/Tehran"))
+>>> dt = JalaliDateTime(1367, 2, 14, 14, 30, 0, tzinfo=ZoneInfo("Asia/Tehran"))
 
 >>> dt.strftime("%Y/%m/%d %H:%M:%S")
 '1367/02/14 14:30:00'
@@ -345,6 +349,7 @@ JalaliDate(1367, 2, 14, Chaharshanbeh)
 If you find this project helpful and would like to support its continued development, please consider donating.
 
 *   **Bitcoin (BTC):** `bc1qg5rp7ymznc98wmhltzvpwl2dvfuvjr33m4hy77`
+*   **Ethereum (ETH):** `0xC7D6bf306E456632764D0aD111C8dBBb43a3B9ad`
 *   **Tron (TRX):** `TDd63bVWZDBHmwVNFgJ6T2WdWmk9z7PBLg`
 *   **Stellar (XLM):** `GDSFPPLY34QSAOTOP4DQDXAI2YDRNRIADZHTN3HCGMQXRLIGPYOEH7L5`
 *   **Solana (SOL):** `CXHKgCBqBYy1hbZKGqaSmMzQoTC4Wx2v8QfL9Z7JBo3A`

{persiantools-5.3.0 → persiantools-5.4.0}/README.md

@@ -104,15 +104,15 @@ The `JalaliDateTime` object represents a date and time in the Jalali calendar.
 
 ```python
 >>> from persiantools.jdatetime import JalaliDateTime
->>> import datetime, pytz
+>>> import datetime
 
 # Current Jalali datetime
 >>> JalaliDateTime.now()
 JalaliDateTime(1404, 3, 16, 2, 17, 14, 907909)
 
-# Current Jalali datetime (timezone-aware)
->>> JalaliDateTime.now(pytz.timezone("Asia/Tehran"))
-JalaliDateTime(1404, 3, 16, 2, 17, 14, 907909, tzinfo=<DstTzInfo 'Asia/Tehran' +0330+3:30:00 STD>)
+>>> from zoneinfo import ZoneInfo
+>>> JalaliDateTime.now(ZoneInfo("Asia/Tehran"))
+JalaliDateTime(1404, 3, 16, 2, 17, 14, 907909, tzinfo=zoneinfo.ZoneInfo(key='Asia/Tehran'))
 
 # Current UTC Jalali datetime
 >>> JalaliDateTime.utcnow()
@@ -132,20 +132,21 @@ JalaliDateTime(1367, 2, 14, 14, 30, 15)
 JalaliDateTime(1400, 1, 1, 15, 30, 0, 10)
 
 # Timezone conversion
->>> tehran_tz = pytz.timezone("Asia/Tehran")
->>> utc_tz = pytz.utc
+>>> from zoneinfo import ZoneInfo
+>>> tehran_tz = ZoneInfo("Asia/Tehran")
+>>> utc_tz = datetime.timezone.utc
 >>> dt_utc = JalaliDateTime.now(utc_tz)
 >>> dt_tehran = dt_utc.astimezone(tehran_tz)
 >>> dt_utc
-JalaliDateTime(1404, 3, 15, 22, 54, 8, 835877, tzinfo=<UTC>)
+JalaliDateTime(1404, 3, 15, 22, 54, 8, 835877, tzinfo=datetime.timezone.utc)
 >>> dt_tehran
-JalaliDateTime(1404, 3, 16, 2, 24, 8, 835877, tzinfo=<DstTzInfo 'Asia/Tehran' +0330+3:30:00 STD>)
+JalaliDateTime(1404, 3, 16, 2, 24, 8, 835877, tzinfo=zoneinfo.ZoneInfo(key='Asia/Tehran'))
 ```
 
 #### Attributes and Methods
 
 ```python
->>> dt_obj = JalaliDateTime(1367, 2, 14, 14, 30, 15, 123, tzinfo=pytz.utc)
+>>> dt_obj = JalaliDateTime(1367, 2, 14, 14, 30, 15, 123, tzinfo=datetime.timezone.utc)
 
 >>> dt_obj.year
 1367
@@ -162,7 +163,7 @@ JalaliDateTime(1404, 3, 16, 2, 24, 8, 835877, tzinfo=<DstTzInfo 'Asia/Tehran' +0
 >>> dt_obj.microsecond
 123
 >>> dt_obj.tzinfo
-<UTC>
+datetime.timezone.utc
 
 # Date part as datetime.date (Gregorian)
 >>> dt_obj.date()
@@ -183,9 +184,9 @@ Based on python `strftime()` behavior
 
 ```python
 >>> from persiantools.jdatetime import JalaliDateTime
->>> import pytz
+>>> from zoneinfo import ZoneInfo
 
->>> dt = JalaliDateTime(1367, 2, 14, 14, 30, 0, tzinfo=pytz.timezone("Asia/Tehran"))
+>>> dt = JalaliDateTime(1367, 2, 14, 14, 30, 0, tzinfo=ZoneInfo("Asia/Tehran"))
 
 >>> dt.strftime("%Y/%m/%d %H:%M:%S")
 '1367/02/14 14:30:00'
@@ -302,6 +303,7 @@ JalaliDate(1367, 2, 14, Chaharshanbeh)
 If you find this project helpful and would like to support its continued development, please consider donating.
 
 *   **Bitcoin (BTC):** `bc1qg5rp7ymznc98wmhltzvpwl2dvfuvjr33m4hy77`
+*   **Ethereum (ETH):** `0xC7D6bf306E456632764D0aD111C8dBBb43a3B9ad`
 *   **Tron (TRX):** `TDd63bVWZDBHmwVNFgJ6T2WdWmk9z7PBLg`
 *   **Stellar (XLM):** `GDSFPPLY34QSAOTOP4DQDXAI2YDRNRIADZHTN3HCGMQXRLIGPYOEH7L5`
 *   **Solana (SOL):** `CXHKgCBqBYy1hbZKGqaSmMzQoTC4Wx2v8QfL9Z7JBo3A`

{persiantools-5.3.0 → persiantools-5.4.0}/persiantools/__init__.py

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

{persiantools-5.3.0 → persiantools-5.4.0}/persiantools/jdatetime.py

@@ -5,8 +5,7 @@ from datetime import datetime as dt
 from datetime import time as _time
 from datetime import timedelta, timezone, tzinfo
 from re import escape as re_escape
-
-import pytz
+from zoneinfo import ZoneInfo
 
 from persiantools import digits, utils
 
@@ -1567,28 +1566,58 @@ class JalaliDateTime(JalaliDate):
         if self._tzinfo is None:
             return None
 
-        offset = self._tzinfo.utcoffset(self.to_gregorian())
+        g = self.to_gregorian()
+        if g.tzinfo is None:
+            g = g.replace(tzinfo=self._tzinfo)
+        try:
+            offset = self._tzinfo.utcoffset(g)
+        except Exception:
+            offset = self._tzinfo.utcoffset(None)
 
+        self.check_utc_offset("utcoffset", offset)
         return offset
 
     def tzname(self):
         if self._tzinfo is None:
             return None
 
-        name = self._tzinfo.tzname(self.to_gregorian())
+        g = self.to_gregorian()
+        if g.tzinfo is None:
+            g = g.replace(tzinfo=self._tzinfo)
+        try:
+            name = self._tzinfo.tzname(g)
+        except Exception:
+            name = self._tzinfo.tzname(None)
 
         if name is not None and not isinstance(name, str):
-            raise TypeError("tzinfo.tzname() must return None or string, " "not '%s'" % type(name))
+            raise TypeError("tzinfo.tzname() must return None or string, not '%s'" % type(name))
 
         return name
 
     def dst(self):
+        """Return DST offset as timedelta or None.
+
+        For stdlib fixed-offset timezones (datetime.timezone, including UTC) this must be timedelta(0).
+        """
         if self._tzinfo is None:
             return None
 
-        offset = self._tzinfo.dst(self.to_gregorian())
-        self.check_utc_offset("dst", offset)
+        from datetime import timedelta as _td
+        from datetime import timezone as _tz
+
+        # datetime.timezone instances (including timezone.utc) never have DST
+        if self._tzinfo is _tz.utc or isinstance(self._tzinfo, type(_tz.utc)):
+            return _td(0)
 
+        g = self.to_gregorian()
+        if g.tzinfo is None:
+            g = g.replace(tzinfo=self._tzinfo)
+        try:
+            offset = self._tzinfo.dst(g)
+        except Exception:
+            offset = self._tzinfo.dst(None)
+
+        self.check_utc_offset("dst", offset)
         return offset
 
     @staticmethod
@@ -1738,7 +1767,7 @@ class JalaliDateTime(JalaliDate):
                 r"(?:[:]?(?P<zS>[0-5]\d))?"
                 r"(?:\.(?P<zf>\d{1,6}))?)"
             ),
-            "%Z": cls._seqToRE(pytz.all_timezones, "Z"),
+            "%Z": r"(?P<Z>[A-Za-z_/\-]+)",
         }
 
         fmt = utils.replace(
@@ -1787,7 +1816,10 @@ class JalaliDateTime(JalaliDate):
                 )
                 tz = timezone(delta)
             elif "Z" in directives.keys():
-                tz = pytz.timezone(directives.get("Z"))
+                try:
+                    tz = ZoneInfo(directives.get("Z"))
+                except Exception:
+                    raise ValueError(f"Unknown time zone name: {directives.get('Z')}")
 
             cls_attrs = {
                 "year": directives.get("Y", 1),

{persiantools-5.3.0 → persiantools-5.4.0/persiantools.egg-info}/PKG-INFO

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: persiantools
-Version: 5.3.0
+Version: 5.4.0
 Summary: Jalali date and datetime with other tools
 Home-page: https://github.com/majiidd/persiantools
 Author: Majid Hajiloo
 Author-email: majid.hajiloo@gmail.com
 License: MIT
+Project-URL: Source, https://github.com/majiidd/persiantools
+Project-URL: Issues, https://github.com/majiidd/persiantools/issues
 Keywords: jalali shamsi persian digits characters converter jalalidate jalalidatetime date datetime jdate jdatetime farsi
 Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: Persian
@@ -27,7 +29,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pytz
+Requires-Dist: tzdata; platform_system == "Windows"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -37,6 +39,7 @@ Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
 Dynamic: license-file
+Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -147,15 +150,15 @@ The `JalaliDateTime` object represents a date and time in the Jalali calendar.
 
 ```python
 >>> from persiantools.jdatetime import JalaliDateTime
->>> import datetime, pytz
+>>> import datetime
 
 # Current Jalali datetime
 >>> JalaliDateTime.now()
 JalaliDateTime(1404, 3, 16, 2, 17, 14, 907909)
 
-# Current Jalali datetime (timezone-aware)
->>> JalaliDateTime.now(pytz.timezone("Asia/Tehran"))
-JalaliDateTime(1404, 3, 16, 2, 17, 14, 907909, tzinfo=<DstTzInfo 'Asia/Tehran' +0330+3:30:00 STD>)
+>>> from zoneinfo import ZoneInfo
+>>> JalaliDateTime.now(ZoneInfo("Asia/Tehran"))
+JalaliDateTime(1404, 3, 16, 2, 17, 14, 907909, tzinfo=zoneinfo.ZoneInfo(key='Asia/Tehran'))
 
 # Current UTC Jalali datetime
 >>> JalaliDateTime.utcnow()
@@ -175,20 +178,21 @@ JalaliDateTime(1367, 2, 14, 14, 30, 15)
 JalaliDateTime(1400, 1, 1, 15, 30, 0, 10)
 
 # Timezone conversion
->>> tehran_tz = pytz.timezone("Asia/Tehran")
->>> utc_tz = pytz.utc
+>>> from zoneinfo import ZoneInfo
+>>> tehran_tz = ZoneInfo("Asia/Tehran")
+>>> utc_tz = datetime.timezone.utc
 >>> dt_utc = JalaliDateTime.now(utc_tz)
 >>> dt_tehran = dt_utc.astimezone(tehran_tz)
 >>> dt_utc
-JalaliDateTime(1404, 3, 15, 22, 54, 8, 835877, tzinfo=<UTC>)
+JalaliDateTime(1404, 3, 15, 22, 54, 8, 835877, tzinfo=datetime.timezone.utc)
 >>> dt_tehran
-JalaliDateTime(1404, 3, 16, 2, 24, 8, 835877, tzinfo=<DstTzInfo 'Asia/Tehran' +0330+3:30:00 STD>)
+JalaliDateTime(1404, 3, 16, 2, 24, 8, 835877, tzinfo=zoneinfo.ZoneInfo(key='Asia/Tehran'))
 ```
 
 #### Attributes and Methods
 
 ```python
->>> dt_obj = JalaliDateTime(1367, 2, 14, 14, 30, 15, 123, tzinfo=pytz.utc)
+>>> dt_obj = JalaliDateTime(1367, 2, 14, 14, 30, 15, 123, tzinfo=datetime.timezone.utc)
 
 >>> dt_obj.year
 1367
@@ -205,7 +209,7 @@ JalaliDateTime(1404, 3, 16, 2, 24, 8, 835877, tzinfo=<DstTzInfo 'Asia/Tehran' +0
 >>> dt_obj.microsecond
 123
 >>> dt_obj.tzinfo
-<UTC>
+datetime.timezone.utc
 
 # Date part as datetime.date (Gregorian)
 >>> dt_obj.date()
@@ -226,9 +230,9 @@ Based on python `strftime()` behavior
 
 ```python
 >>> from persiantools.jdatetime import JalaliDateTime
->>> import pytz
+>>> from zoneinfo import ZoneInfo
 
->>> dt = JalaliDateTime(1367, 2, 14, 14, 30, 0, tzinfo=pytz.timezone("Asia/Tehran"))
+>>> dt = JalaliDateTime(1367, 2, 14, 14, 30, 0, tzinfo=ZoneInfo("Asia/Tehran"))
 
 >>> dt.strftime("%Y/%m/%d %H:%M:%S")
 '1367/02/14 14:30:00'
@@ -345,6 +349,7 @@ JalaliDate(1367, 2, 14, Chaharshanbeh)
 If you find this project helpful and would like to support its continued development, please consider donating.
 
 *   **Bitcoin (BTC):** `bc1qg5rp7ymznc98wmhltzvpwl2dvfuvjr33m4hy77`
+*   **Ethereum (ETH):** `0xC7D6bf306E456632764D0aD111C8dBBb43a3B9ad`
 *   **Tron (TRX):** `TDd63bVWZDBHmwVNFgJ6T2WdWmk9z7PBLg`
 *   **Stellar (XLM):** `GDSFPPLY34QSAOTOP4DQDXAI2YDRNRIADZHTN3HCGMQXRLIGPYOEH7L5`
 *   **Solana (SOL):** `CXHKgCBqBYy1hbZKGqaSmMzQoTC4Wx2v8QfL9Z7JBo3A`

persiantools-5.4.0/persiantools.egg-info/requires.txt

@@ -0,0 +1,3 @@
+
+[:platform_system == "Windows"]
+tzdata

persiantools-5.4.0/pyproject.toml

@@ -0,0 +1,39 @@
+[tool.black]
+line-length = 120
+target-version = ["py39", "py310", "py311", "py312", "py313"]
+include = '\.pyi?$'
+exclude = '''
+(
+  /(
+      \.eggs
+    | \.git
+    | \.hg
+    | \.mypy_cache
+    | \.tox
+    | \.venv
+    | _build
+    | buck-out
+    | build
+    | dist
+  )/
+)
+'''
+
+[tool.isort]
+profile = "black"
+line_length = 120
+
+[tool.pytest.ini_options]
+addopts = "-ra"
+testpaths = ["tests"]
+python_files = ["test_*.py"]
+python_functions = ["test_*"]
+
+[tool.mypy]
+python_version = "3.9"
+warn_unused_ignores = true
+warn_redundant_casts = true
+disallow_incomplete_defs = false
+no_implicit_optional = true
+check_untyped_defs = false
+ignore_missing_imports = false

{persiantools-5.3.0 → persiantools-5.4.0}/setup.py

@@ -1,18 +1,24 @@
-#!/usr/bin/env python
+import re
 
 from setuptools import setup
 
-import persiantools
-
 
 def readme():
     with open("README.md", encoding="utf-8") as f:
         return f.read()
 
 
+def read_version():
+    with open("persiantools/__init__.py", encoding="utf-8") as f:
+        m = re.search(r"^__version__\s*=\s*['\"]([^'\"]+)['\"]", f.read(), re.M)
+        if not m:
+            raise RuntimeError("Cannot find __version__ in persiantools/__init__.py")
+        return m.group(1)
+
+
 setup(
     name="persiantools",
-    version=persiantools.__version__,
+    version=read_version(),
     description="Jalali date and datetime with other tools",
     long_description=readme(),
     long_description_content_type="text/markdown",
@@ -38,14 +44,17 @@ setup(
     keywords="jalali shamsi persian digits characters converter jalalidate "
     "jalalidatetime date datetime jdate jdatetime farsi",
     url="https://github.com/majiidd/persiantools",
+    project_urls={
+        "Source": "https://github.com/majiidd/persiantools",
+        "Issues": "https://github.com/majiidd/persiantools/issues",
+    },
     author="Majid Hajiloo",
     author_email="majid.hajiloo@gmail.com",
     license="MIT",
     license_files=("LICENSE",),
     packages=["persiantools"],
     python_requires=">=3.9",
-    tests_require=["pytest", "pytest-cov"],
-    install_requires=["pytz"],
+    install_requires=["tzdata; platform_system == 'Windows'"],
     include_package_data=True,
     zip_safe=False,
 )

{persiantools-5.3.0 → persiantools-5.4.0}/tests/test_jalalidate.py

@@ -33,6 +33,7 @@ class TestJalaliDate(TestCase):
             (JalaliDate(1403, 8, 18), date(2024, 11, 8)),
             (JalaliDate(1404, 3, 16), date(2025, 6, 6)),
             (JalaliDate(1403, 10, 27), date(2025, 1, 16)),
+            (JalaliDate(1404, 7, 4), date(2025, 9, 26)),
             (JalaliDate(1210, 12, 29), date(1832, 3, 19)),
             (JalaliDate(1367, 12, 29), date(1989, 3, 20)),
             (JalaliDate(1392, 12, 29), date(2014, 3, 20)),

{persiantools-5.3.0 → persiantools-5.4.0}/tests/test_jalalidatetime.py

@@ -5,9 +5,9 @@ from datetime import date, datetime
 from datetime import time as _time
 from datetime import timedelta, timezone
 from unittest import TestCase
+from zoneinfo import ZoneInfo
 
 import pytest
-import pytz
 
 from persiantools.jdatetime import JalaliDate, JalaliDateTime, _is_ascii_digit
 
@@ -46,7 +46,7 @@ class TestJalaliDateTime(TestCase):
         g = JalaliDateTime.now()
         self.assertEqual(g.time(), _time(g.hour, g.minute, g.second, g.microsecond))
 
-        g = g.replace(tzinfo=pytz.timezone("America/Los_Angeles"))
+        g = g.replace(tzinfo=ZoneInfo("America/Los_Angeles"))
         self.assertEqual(
             g.timetz(),
             _time(
@@ -54,13 +54,13 @@ class TestJalaliDateTime(TestCase):
                 g.minute,
                 g.second,
                 g.microsecond,
-                pytz.timezone("America/Los_Angeles"),
+                ZoneInfo("America/Los_Angeles"),
             ),
         )
 
         self.assertEqual(
-            JalaliDateTime.fromtimestamp(578723400, pytz.utc),
-            JalaliDateTime(1367, 2, 14, 4, 30, 0, 0, pytz.utc),
+            JalaliDateTime.fromtimestamp(578723400, timezone.utc),
+            JalaliDateTime(1367, 2, 14, 4, 30, 0, 0, timezone.utc),
         )
         self.assertEqual(
             JalaliDateTime.utcfromtimestamp(578723400),
@@ -111,27 +111,27 @@ class TestJalaliDateTime(TestCase):
 
     def test_others(self):
         self.assertTrue(JalaliDateTime.fromtimestamp(time.time() - 10) <= JalaliDateTime.now())
-        self.assertEqual(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0, pytz.utc).timestamp(), 578723400)
+        self.assertEqual(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0, timezone.utc).timestamp(), 578723400)
         self.assertEqual(
-            JalaliDateTime.fromtimestamp(578723400, pytz.utc),
-            JalaliDateTime(1367, 2, 14, 4, 30, 0, 0, pytz.utc),
+            JalaliDateTime.fromtimestamp(578723400, timezone.utc),
+            JalaliDateTime(1367, 2, 14, 4, 30, 0, 0, timezone.utc),
         )
         self.assertEqual(JalaliDateTime(1367, 2, 14, 4, 30, 4, 4444).jdate(), JalaliDate(1367, 2, 14))
         self.assertEqual(JalaliDateTime(1367, 2, 14, 4, 30, 4, 4444).date(), date(1988, 5, 4))
         self.assertEqual(
-            JalaliDateTime(1367, 2, 14, 4, 30, 0, 0).replace(tzinfo=pytz.utc).__repr__(),
-            "JalaliDateTime(1367, 2, 14, 4, 30, tzinfo=<UTC>)",
+            JalaliDateTime(1367, 2, 14, 4, 30, 0, 0).replace(tzinfo=timezone.utc).__repr__(),
+            "JalaliDateTime(1367, 2, 14, 4, 30, tzinfo=datetime.timezone.utc)",
         )
         self.assertEqual(
             JalaliDateTime(1367, 2, 14, 4, 30, 4, 4444).replace(year=1395, day=3, minute=59),
             JalaliDateTime(1395, 2, 3, 4, 59, 4, 4444),
         )
 
-        self.assertEqual(JalaliDateTime.now(pytz.utc).tzname(), "UTC")
+        self.assertEqual(JalaliDateTime.now(timezone.utc).tzname(), "UTC")
         self.assertIsNone(JalaliDateTime.today().tzname())
         self.assertIsNone(JalaliDateTime.today().dst())
 
-        dt = JalaliDateTime(1367, 2, 14, 4, 30, 0, 0, pytz.utc)
+        dt = JalaliDateTime(1367, 2, 14, 4, 30, 0, 0, timezone.utc)
         self.assertEqual(dt.dst(), timedelta(0))
 
         self.assertEqual(
@@ -152,14 +152,37 @@ class TestJalaliDateTime(TestCase):
         )
 
         self.assertEqual(
-            JalaliDateTime(1367, 2, 14, 4, 30, 0, 1, pytz.utc).isoformat(),
+            JalaliDateTime(1367, 2, 14, 4, 30, 0, 1, timezone.utc).isoformat(),
             "1367-02-14T04:30:00.000001+00:00",
         )
         self.assertEqual(
-            JalaliDateTime(1367, 2, 14, 4, 30, 0, 1, pytz.utc).__str__(),
+            JalaliDateTime(1367, 2, 14, 4, 30, 0, 1, timezone.utc).__str__(),
             "1367-02-14 04:30:00.000001+00:00",
         )
 
+    def test_dst_fixed_offset_zero(self):
+        jdt = JalaliDateTime(1400, 1, 1, 12, 0, 0, tzinfo=timezone(timedelta(hours=3)))
+        assert jdt.dst() == timedelta(0)
+
+    def test_tzname_fixed_offset(self):
+        jdt = JalaliDateTime(1400, 1, 1, 12, 0, 0, tzinfo=timezone(timedelta(hours=-4, minutes=-45)))
+        # stdlib datetime.timezone tzname format is "UTC±HH:MM"
+        assert jdt.tzname() == "UTC-04:45"
+
+    def test_strptime_Z_with_zoneinfo(self):
+        # 1402-01-01 (2023-03-21) after Iran removed DST; Asia/Tehran is fixed +03:30
+        s = "1402-01-01 12:00:00 Asia/Tehran"
+        fmt = "%Y-%m-%d %H:%M:%S %Z"
+        jdt = JalaliDateTime.strptime(s, fmt)
+        assert isinstance(jdt.tzinfo, ZoneInfo)
+        assert jdt.utcoffset() == timedelta(hours=3, minutes=30)
+
+    def test_strptime_Z_invalid_name(self):
+        s = "1400-01-01 12:00:00 Mars/Phobos"
+        fmt = "%Y-%m-%d %H:%M:%S %Z"
+        with pytest.raises(ValueError):
+            JalaliDateTime.strptime(s, fmt)
+
     def test_operators(self):
         self.assertEqual(
             JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) + timedelta(days=30, seconds=15, milliseconds=1),
@@ -201,13 +224,13 @@ class TestJalaliDateTime(TestCase):
         self.assertTrue(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) >= datetime(1988, 5, 4, 0, 0, 0, 0))
         self.assertTrue(JalaliDateTime(1395, 4, 15, 20, 13, 59, 0) == JalaliDateTime(1395, 4, 15, 20, 13, 59, 0))
         self.assertTrue(
-            JalaliDateTime(1395, 4, 15, 20, 13, 59, 0, pytz.utc) != JalaliDateTime(1395, 4, 15, 20, 13, 59, 0)
+            JalaliDateTime(1395, 4, 15, 20, 13, 59, 0, timezone.utc) != JalaliDateTime(1395, 4, 15, 20, 13, 59, 0)
         )
 
         self.assertEqual(
-            JalaliDateTime(1395, 4, 16, 20, 14, 30, 0, pytz.utc)
-            - JalaliDateTime(1395, 4, 16, 20, 14, 30, 0, pytz.timezone("Asia/Tehran")),
-            pytz.timezone("Asia/Tehran")._utcoffset,
+            JalaliDateTime(1395, 4, 16, 20, 14, 30, 0, timezone.utc)
+            - JalaliDateTime(1395, 4, 16, 20, 14, 30, 0, ZoneInfo("Asia/Tehran")),
+            timedelta(hours=4, minutes=30),
         )
 
         self.assertFalse(JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) == {"year": 1367})
@@ -233,7 +256,7 @@ class TestJalaliDateTime(TestCase):
             assert JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) > date(1988, 4, 5)
 
         with pytest.raises(NotImplementedError):
-            assert JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) >= pytz.utc
+            assert JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) >= timezone.utc
 
         with pytest.raises(TypeError):
             assert JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) >= JalaliDate(1392, 4, 5)
@@ -245,7 +268,7 @@ class TestJalaliDateTime(TestCase):
             assert JalaliDateTime(1367, 2, 14, 4, 30, 0, 0) - []
 
     def test_hash(self):
-        j1 = JalaliDateTime.today().replace(tzinfo=pytz.utc)
+        j1 = JalaliDateTime.today().replace(tzinfo=timezone.utc)
         j2 = JalaliDateTime(1369, 7, 1, 0, 0, 0, 0)
         j3 = JalaliDateTime(datetime(1990, 9, 23, 0, 0, 0, 0))
 
@@ -268,7 +291,7 @@ class TestJalaliDateTime(TestCase):
 
     def test_pickle(self):
         file = open("save.p", "wb")
-        now = JalaliDateTime.now().replace(tzinfo=pytz.timezone("Asia/Tehran"))
+        now = JalaliDateTime.now().replace(tzinfo=ZoneInfo("Asia/Tehran"))
         pickle.dump(now, file)
         file.close()
 
@@ -282,27 +305,27 @@ class TestJalaliDateTime(TestCase):
 
     def test_format(self):
         self.assertEqual(
-            JalaliDateTime(1369, 7, 1, 14, 0, 10, 0, pytz.utc).strftime("%X %p %z %Z"),
+            JalaliDateTime(1369, 7, 1, 14, 0, 10, 0, timezone.utc).strftime("%X %p %z %Z"),
             "14:00:10 PM +0000 UTC",
         )
 
         self.assertEqual(
-            JalaliDateTime(1367, 2, 14, 14, 0, 10, 0, pytz.utc).strftime("%c"),
+            JalaliDateTime(1367, 2, 14, 14, 0, 10, 0, timezone.utc).strftime("%c"),
             "Chaharshanbeh 14 Ordibehesht 1367 14:00:10",
         )
 
         self.assertEqual(
-            JalaliDateTime(1397, 11, 30, 14, 0, 10, 0, pytz.utc).strftime("%c"),
+            JalaliDateTime(1397, 11, 30, 14, 0, 10, 0, timezone.utc).strftime("%c"),
             "Seshanbeh 30 Bahman 1397 14:00:10",
         )
 
         self.assertEqual(
-            JalaliDateTime(1367, 2, 14, 11, 0, 10, 553, pytz.utc).strftime("%I:%M:%S.%f %p"),
+            JalaliDateTime(1367, 2, 14, 11, 0, 10, 553, timezone.utc).strftime("%I:%M:%S.%f %p"),
             "11:00:10.000553 AM",
         )
 
         self.assertEqual(
-            JalaliDateTime(1367, 2, 14, 14, 0, 10, 553, pytz.utc).strftime("%I:%M:%S.%f %p"),
+            JalaliDateTime(1367, 2, 14, 14, 0, 10, 553, timezone.utc).strftime("%I:%M:%S.%f %p"),
             "02:00:10.000553 PM",
         )
 
@@ -346,7 +369,7 @@ class TestJalaliDateTime(TestCase):
             JalaliDateTime.strptime("1400-01-01 02:00:10.000553 PM", "%Y-%m-%d %I:%M:%S.%f %p"),
         )
 
-        jdt = JalaliDateTime(1374, 4, 8, 16, 28, 3, 227, pytz.utc)
+        jdt = JalaliDateTime(1374, 4, 8, 16, 28, 3, 227, timezone.utc)
         self.assertEqual(jdt, JalaliDateTime.strptime(jdt.strftime("%c %f %z %Z"), "%c %f %z %Z"))
 
         jdt_utc_combined = JalaliDateTime(1374, 4, 8, 16, 28, 3, 227, timezone.utc)

persiantools-5.3.0/persiantools.egg-info/requires.txt

@@ -1 +0,0 @@
-pytz

persiantools-5.3.0/pyproject.toml

@@ -1,27 +0,0 @@
-[tool.black]
-line-length = 120
-include = '\.pyi?$'
-exclude = '''
-(
-  /(
-      \.eggs
-    | \.git
-    | \.hg
-    | \.mypy_cache
-    | \.tox
-    | \.venv
-    | _build
-    | buck-out
-    | build
-    | dist
-  )/
-)
-'''
-
-[tool.isort]
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = 0
-use_parentheses = true
-ensure_newline_before_comments = true
-line_length = 120