dateutilx 0.1.1__tar.gz → 0.2.0__tar.gz

{dateutilx-0.1.1 → dateutilx-0.2.0}/.gitignore

@@ -13,7 +13,7 @@ dist/
 .tox/
 .pytest_cache/
 venv/
-.venv/
+.venv*/
 .hypothesis/
 .coverage
 

{dateutilx-0.1.1 → dateutilx-0.2.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: dateutilx
-Version: 0.1.1
+Version: 0.2.0
 Summary: Modern extension to the standard Python datetime module
 Project-URL: Homepage, https://github.com/rsb-23/dateutilx
-Project-URL: Documentation, https://dateutil.readthedocs.io/en/stable/
+Project-URL: Documentation, https://dateutilx.readthedocs.io/en/stable/
 Project-URL: Source, https://github.com/rsb-23/dateutilx
 Author: Rishabh B
 License: Copyright 2017- Paul Ganssle <paul@ganssle.io>
@@ -72,20 +72,19 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.10
+Requires-Python: >=3.11
 Requires-Dist: tzdata; sys_platform == 'win32'
 Description-Content-Type: text/markdown
 
 > [!NOTE]
-> This package is rewrite of python-dateutil package with v2.9.0.post0 as base, to support active python versions only.
-> It is not related with the base project and its authors.
+> This package is rewrite of `python-dateutil v2.9.0.post0` as base, to support active python versions only.  
+> It is not related with the base project and its authors.  
 > Docs of base project are under `.base_project/`
 
 # dateutilx - powerful extensions to datetime
@@ -127,7 +126,7 @@ https://github.com/rsb-23/dateutilx/
 * Computing of dates based on very flexible recurrence rules, using a superset of
   the [iCalendar](https://www.ietf.org/rfc/rfc2445.txt) specification. Parsing of RFC strings is supported as well.
 * Generic parsing of dates in almost any string format;
-* Timezone (tzinfo) implementations for tzfile(5) format files (/etc/localtime, /usr/share/zoneinfo, etc), TZ
+* Timezone (tzinfo) implementations for tzfile (5) format files (/etc/localtime, /usr/share/zoneinfo, etc), TZ
   environment string (in all known formats), iCalendar format files, given ranges (with help from relative deltas),
   local machine timezone, fixed offset timezone, UTC timezone, and Windows registry-based time zones.
 * Internal up-to-date world timezone information based on Olson's database.
@@ -136,13 +135,10 @@ https://github.com/rsb-23/dateutilx/
 
 ## Quick example
 
-Here's a snapshot, just to give an idea about the power of the
-package. For more examples, look at the documentation.
+Here's a snapshot, just to give an idea about the power of the package. For more examples, look at the documentation.
 
-Suppose you want to know how much time is left, in
-years/months/days/etc, before the next easter happening on a
-year with a Friday 13th in August, and you want to get today's
-date out of the "date" unix system command. Here is the code:
+Suppose you want to know how much time is left, in years/months/days/etc, before the next easter happening on a year
+with a Friday 13th in August, and you want to get today's date out of the "date" unix system command. Here is the code:
 
 ```pycon
 >>> from datetime import *
@@ -174,14 +170,7 @@ more information about how to contribute to the project, see the `CONTRIBUTING.m
 
 ## Author
 
-The dateutil module was written by Gustavo Niemeyer <gustavo@niemeyer.net> in 2003.
-
-It was maintained by:
-
-* Gustavo Niemeyer <gustavo@niemeyer.net> 2003-2011
-* Tomi Pieviläinen <tomi.pievilainen@iki.fi> 2012-2014
-* Yaron de Leeuw <me@jarondl.net> 2014-2016
-* Paul Ganssle <paul@ganssle.io> 2015-
+The dateutilx module is improved/re-written by rsb-23 in 2026.
 
 ## License
 
@@ -192,17 +181,11 @@ those those explicitly relicensed - are released only under the BSD 3-Clause Lic
 
 
 [license]: https://github.com/rsb-23/dateutilx/blob/main/LICENSE
-
 [lint-badge]: https://github.com/rsb-23/dateutilx/actions/workflows/code-lint.yml/badge.svg
-
 [tests-badge]: https://github.com/rsb-23/dateutilx/actions/workflows/code-test.yml/badge.svg
 
 [license-badge]: https://img.shields.io/pypi/l/dateutilx.svg?style=flat-square
-
 [pre-commit-badge]: https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white
-
 [py-version]: https://img.shields.io/pypi/pyversions/dateutilx
-
 [pypi-downloads]: https://img.shields.io/pypi/dm/dateutilx?label=Downloads
-
 [pypi-v]: https://img.shields.io/pypi/v/dateutilx?label=pypi

{dateutilx-0.1.1 → dateutilx-0.2.0}/README.md

@@ -1,6 +1,6 @@
 > [!NOTE]
-> This package is rewrite of python-dateutil package with v2.9.0.post0 as base, to support active python versions only.
-> It is not related with the base project and its authors.
+> This package is rewrite of `python-dateutil v2.9.0.post0` as base, to support active python versions only.  
+> It is not related with the base project and its authors.  
 > Docs of base project are under `.base_project/`
 
 # dateutilx - powerful extensions to datetime
@@ -42,7 +42,7 @@ https://github.com/rsb-23/dateutilx/
 * Computing of dates based on very flexible recurrence rules, using a superset of
   the [iCalendar](https://www.ietf.org/rfc/rfc2445.txt) specification. Parsing of RFC strings is supported as well.
 * Generic parsing of dates in almost any string format;
-* Timezone (tzinfo) implementations for tzfile(5) format files (/etc/localtime, /usr/share/zoneinfo, etc), TZ
+* Timezone (tzinfo) implementations for tzfile (5) format files (/etc/localtime, /usr/share/zoneinfo, etc), TZ
   environment string (in all known formats), iCalendar format files, given ranges (with help from relative deltas),
   local machine timezone, fixed offset timezone, UTC timezone, and Windows registry-based time zones.
 * Internal up-to-date world timezone information based on Olson's database.
@@ -51,13 +51,10 @@ https://github.com/rsb-23/dateutilx/
 
 ## Quick example
 
-Here's a snapshot, just to give an idea about the power of the
-package. For more examples, look at the documentation.
+Here's a snapshot, just to give an idea about the power of the package. For more examples, look at the documentation.
 
-Suppose you want to know how much time is left, in
-years/months/days/etc, before the next easter happening on a
-year with a Friday 13th in August, and you want to get today's
-date out of the "date" unix system command. Here is the code:
+Suppose you want to know how much time is left, in years/months/days/etc, before the next easter happening on a year
+with a Friday 13th in August, and you want to get today's date out of the "date" unix system command. Here is the code:
 
 ```pycon
 >>> from datetime import *
@@ -89,14 +86,7 @@ more information about how to contribute to the project, see the `CONTRIBUTING.m
 
 ## Author
 
-The dateutil module was written by Gustavo Niemeyer <gustavo@niemeyer.net> in 2003.
-
-It was maintained by:
-
-* Gustavo Niemeyer <gustavo@niemeyer.net> 2003-2011
-* Tomi Pieviläinen <tomi.pievilainen@iki.fi> 2012-2014
-* Yaron de Leeuw <me@jarondl.net> 2014-2016
-* Paul Ganssle <paul@ganssle.io> 2015-
+The dateutilx module is improved/re-written by rsb-23 in 2026.
 
 ## License
 
@@ -107,17 +97,11 @@ those those explicitly relicensed - are released only under the BSD 3-Clause Lic
 
 
 [license]: https://github.com/rsb-23/dateutilx/blob/main/LICENSE
-
 [lint-badge]: https://github.com/rsb-23/dateutilx/actions/workflows/code-lint.yml/badge.svg
-
 [tests-badge]: https://github.com/rsb-23/dateutilx/actions/workflows/code-test.yml/badge.svg
 
 [license-badge]: https://img.shields.io/pypi/l/dateutilx.svg?style=flat-square
-
 [pre-commit-badge]: https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white
-
 [py-version]: https://img.shields.io/pypi/pyversions/dateutilx
-
 [pypi-downloads]: https://img.shields.io/pypi/dm/dateutilx?label=Downloads
-
 [pypi-v]: https://img.shields.io/pypi/v/dateutilx?label=pypi

{dateutilx-0.1.1 → dateutilx-0.2.0}/pyproject.toml

@@ -18,7 +18,6 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -27,7 +26,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
 ]
 
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 dependencies = ["tzdata; sys_platform == 'win32'"]
 
 [dependency-groups]
@@ -37,21 +36,22 @@ test = ["hypothesis", "pytest", "pytest-cov"]
 
 [project.urls]
 Homepage = "https://github.com/rsb-23/dateutilx"
-Documentation = "https://dateutil.readthedocs.io/en/stable/"
+Documentation = "https://dateutilx.readthedocs.io/en/stable/"
 Source = "https://github.com/rsb-23/dateutilx"
 
 # Build Config
 [tool.hatch.version]
 source = "vcs"
 [tool.hatch.build.targets.sdist]
-include = ["src/dateutilx", "src/dateutil", "LICENSE", "README.md", "pyproject.toml"]
+include = ["src", "LICENSE", "README.md", "pyproject.toml"]
 [tool.hatch.build.targets.wheel]
-packages = ["src/dateutilx", "src/dateutil"]
+packages = ["src"]
 
+[tool.coverage.run]
+source = ["src"]
 [tool.coverage.report]
 fail_under = 85.0
-[tool.coverage.run]
-source = ["src/"]
+skip_covered = true
 
 [tool.pytest.ini_options]
 python_files = ["test_*.py", "*_test.py", "*_solution.py", ]

{dateutilx-0.1.1/src/dateutilx → dateutilx-0.2.0/src}/easter.py

@@ -66,7 +66,7 @@ def easter(year, method: EasterAlgo | int = EasterAlgo.WESTERN):
     # e - Extra days to add for method 2 (converting Julian
     #     date to Gregorian date)
 
-    y = year
+    y = int(year)
     g = y % 19
     e = 0
     if method < 3:
@@ -90,4 +90,4 @@ def easter(year, method: EasterAlgo | int = EasterAlgo.WESTERN):
     p = i - j + e
     d = 1 + (p + 27 + (p + 6) // 40) % 31
     m = 3 + (p + 26) // 30
-    return datetime.date(int(y), int(m), int(d))
+    return datetime.date(y, m, d)

dateutilx-0.2.0/src/helper/__init__.py

@@ -0,0 +1,4 @@
+from .constants import Day, Frequency, Month
+from .funcs import is_windows_os
+
+__all__ = ["Day", "Frequency", "Month", "is_windows_os"]

{dateutilx-0.1.1/src/dateutilx → dateutilx-0.2.0/src}/helper/constants.py

@@ -1,12 +1,7 @@
 import calendar
-import sys
 from enum import IntEnum
 
 
-def is_windows_os() -> bool:
-    return sys.platform.startswith("win")
-
-
 class Frequency(IntEnum):
     YEARLY = 0
     MONTHLY = 1

dateutilx-0.2.0/src/helper/funcs.py

@@ -0,0 +1,5 @@
+import sys
+
+
+def is_windows_os() -> bool:
+    return sys.platform.startswith("win")

{dateutilx-0.1.1/src/dateutilx → dateutilx-0.2.0/src}/parser/_parser.py

@@ -34,12 +34,13 @@ import string
 import time
 import warnings
 from calendar import monthrange
+from collections import deque
 from decimal import Decimal
 from io import StringIO
 from warnings import warn
 
-from dateutilx import relativedelta, tz
-from dateutilx.errors import ParserError, UnknownTimezoneWarning
+from src import relativedelta, tz
+from src.errors import ParserError, UnknownTimezoneWarning
 
 from .utils import standard_dt_parser
 
@@ -65,7 +66,7 @@ class _TimeLex:
 
         self.instream = instream
         self.charstack = []
-        self.tokenstack = []
+        self.tokenstack = deque()
         self.eof = False
 
     def get_token(self):
@@ -83,7 +84,7 @@ class _TimeLex:
         demands that multiple tokens be parsed at once.
         """
         if self.tokenstack:
-            return self.tokenstack.pop(0)
+            return self.tokenstack.popleft()
 
         seenletters = False
         token = None
@@ -309,10 +310,7 @@ class ParserInfo:
         return self._hms.get(name.lower())
 
     def ampm(self, name):
-        try:
-            return self._ampm[name.lower()]
-        except KeyError:
-            return None
+        return self._ampm.get(name.lower())
 
     def pertain(self, name):
         return name.lower() in self._pertain
@@ -564,8 +562,8 @@ class Parser:
             .. doctest::
                :options: +NORMALIZE_WHITESPACE
 
-                >>> from dateutilx.parser import parse
-                >>> from dateutilx.tz import gettz
+                >>> from src.parser import parse
+                >>> from src.tz import gettz
                 >>> tzinfos = {"BRST": -7200, "CST": gettz("America/Chicago")}
                 >>> parse("2012-01-19 17:21:00 BRST", tzinfos=tzinfos)
                 datetime.datetime(2012, 1, 19, 17, 21, tzinfo=tzoffset(u'BRST', -7200))
@@ -634,7 +632,7 @@ class Parser:
         ]
         # fmt: on
 
-    def _parse(self, timestr, dayfirst=None, yearfirst=None, fuzzy=False, fuzzy_with_tokens=False):
+    def _parse(self, timestr, dayfirst=None, yearfirst=None, fuzzy: bool = False, fuzzy_with_tokens: bool = False):
         """
         Private method which performs the heavy lifting of parsing, called from
         ``parse()``, which passes on its ``kwargs`` to this function.
@@ -669,7 +667,7 @@ class Parser:
 
             .. doctest::
 
-                >>> from dateutilx.parser import parse
+                >>> from src.parser import parse
                 >>> parse("Today is January 1, 2047 at 8:21:00AM", fuzzy_with_tokens=True)
                 (datetime.datetime(2047, 1, 1, 8, 21), (u'Today is ', u' ', u'at '))
 
@@ -678,12 +676,8 @@ class Parser:
             fuzzy = True
 
         info = self.info
-
-        if dayfirst is None:
-            dayfirst = info.dayfirst
-
-        if yearfirst is None:
-            yearfirst = info.yearfirst
+        dayfirst = dayfirst or info.dayfirst
+        yearfirst = yearfirst or info.yearfirst
 
         res = self._Result()
         _tokens = _TimeLex.split(timestr)  # Splits the timestr into tokens
@@ -706,7 +700,7 @@ class Parser:
 
                 if value is not None:
                     # Numeric token
-                    i = self._parse_numeric_token(_tokens, i, info, ymd, res, fuzzy)
+                    i = self._parse_numeric_token(_tokens, i, info=info, ymd=ymd, res=res, fuzzy=fuzzy)
 
                 # Check weekday
                 elif info.weekday(_tokens[i]) is not None:
@@ -800,13 +794,14 @@ class Parser:
                     res.tzoffset = signal * (hour_offset * 3600 + min_offset * 60)
 
                     # Look for a timezone name between parenthesis
-                    if (
-                        i + 5 < len_l
-                        and info.jump(_tokens[i + 2])
-                        and _tokens[i + 3] == "("
-                        and _tokens[i + 5] == ")"
-                        and len(_tokens[i + 4]) >= 3
-                        and self._could_be_tzname(res.hour, res.tzname, None, _tokens[i + 4])
+                    if i + 5 < len_l and all(
+                        (
+                            info.jump(_tokens[i + 2]),
+                            _tokens[i + 3] == "(",
+                            _tokens[i + 5] == ")",
+                            len(_tokens[i + 4]) >= 3,
+                            self._could_be_tzname(res.hour, res.tzname, None, _tokens[i + 4]),
+                        )
                     ):
                         # -0300 (BRST)
                         res.tzname = _tokens[i + 4]
@@ -842,7 +837,7 @@ class Parser:
 
         return res, None
 
-    def _parse_numeric_token(self, tokens, idx, info, ymd, res, fuzzy):
+    def _parse_numeric_token(self, tokens, idx, *, info, ymd, res, fuzzy):
         # Token is a number
         value_repr = tokens[idx]
         try:
@@ -854,11 +849,13 @@ class Parser:
 
         len_l = len(tokens)
 
-        if (
-            len(ymd) == 3
-            and len_li in (2, 4)
-            and res.hour is None
-            and (idx + 1 >= len_l or (tokens[idx + 1] != ":" and info.hms(tokens[idx + 1]) is None))
+        if all(
+            (
+                len(ymd) == 3,
+                len_li in (2, 4),
+                res.hour is None,
+                (idx + 1 >= len_l or (tokens[idx + 1] != ":" and info.hms(tokens[idx + 1]) is None)),
+            )
         ):
             # 19990101T23[59]
             s = tokens[idx]
@@ -1271,8 +1268,8 @@ def parse(timestr, parser_info=None, **kwargs):
         .. doctest::
            :options: +NORMALIZE_WHITESPACE
 
-            >>> from dateutilx.parser import parse
-            >>> from dateutilx.tz import gettz
+            >>> from src.parser import parse
+            >>> from src.tz import gettz
             >>> tzinfos = {"BRST": -7200, "CST": gettz("America/Chicago")}
             >>> parse("2012-01-19 17:21:00 BRST", tzinfos=tzinfos)
             datetime.datetime(2012, 1, 19, 17, 21, tzinfo=tzoffset(u'BRST', -7200))
@@ -1308,7 +1305,7 @@ def parse(timestr, parser_info=None, **kwargs):
 
         .. doctest::
 
-            >>> from dateutilx.parser import parse
+            >>> from src.parser import parse
             >>> parse("Today is January 1, 2047 at 8:21:00AM", fuzzy_with_tokens=True)
             (datetime.datetime(2047, 1, 1, 8, 21), (u'Today is ', u' ', u'at '))
 
@@ -1349,8 +1346,9 @@ class _TzParser:
             self.end = self._Attr()
 
     def parse(self, tzstr):
+        tzstr_pattern = re.compile(r"([,:.]|[a-zA-Z]+|[0-9]+)")
         res = self._Result()
-        _tmp_list = [x for x in re.split(r"([,:.]|[a-zA-Z]+|[0-9]+)", tzstr) if x]
+        _tmp_list = [x for x in re.split(tzstr_pattern, tzstr) if x]
         used_idxs = []
         try:
             i, len_l = 0, len(_tmp_list)
@@ -1360,43 +1358,43 @@ class _TzParser:
                 j = i
                 while j < len_l and not [x for x in _tmp_list[j] if x in "0123456789:,-+"]:
                     j += 1
-                if j != i:
-                    if not res.stdabbr:
-                        offattr = "stdoffset"
-                        res.stdabbr = "".join(_tmp_list[i:j])
-                    else:
-                        offattr = "dstoffset"
-                        res.dstabbr = "".join(_tmp_list[i:j])
-
-                    used_idxs.extend([*range(j)])
-                    i = j
-                    if i < len_l and (_tmp_list[i] in ("+", "-") or _tmp_list[i][0] in "0123456789"):
-                        if _tmp_list[i] in ("+", "-"):
-                            # Yes, that's right. See the TZ variable documentation.
-                            signal = (1, -1)[_tmp_list[i] == "+"]
-                            used_idxs.append(i)
-                            i += 1
-                        else:
-                            signal = -1
-                        len_li = len(_tmp_list[i])
-                        if len_li == 4:
-                            # -0300
-                            setattr(res, offattr, (int(_tmp_list[i][:2]) * 3600 + int(_tmp_list[i][2:]) * 60) * signal)
-                        elif i + 1 < len_l and _tmp_list[i + 1] == ":":
-                            # -03:00
-                            setattr(res, offattr, (int(_tmp_list[i]) * 3600 + int(_tmp_list[i + 2]) * 60) * signal)
-                            used_idxs.append(i)
-                            i += 2
-                        elif len_li <= 2:
-                            # -[0]3
-                            setattr(res, offattr, int(_tmp_list[i][:2]) * 3600 * signal)
-                        else:
-                            return None
+                if j == i:
+                    break
+
+                if not res.stdabbr:
+                    offattr = "stdoffset"
+                    res.stdabbr = "".join(_tmp_list[i:j])
+                else:
+                    offattr = "dstoffset"
+                    res.dstabbr = "".join(_tmp_list[i:j])
+
+                used_idxs.extend([*range(j)])
+                i = j
+                if i < len_l and (_tmp_list[i] in ("+", "-") or _tmp_list[i][0] in "0123456789"):
+                    if _tmp_list[i] in ("+", "-"):
+                        # Yes, that's right. See the TZ variable documentation.
+                        signal = (1, -1)[_tmp_list[i] == "+"]
                         used_idxs.append(i)
                         i += 1
-                    if res.dstabbr:
-                        break
-                else:
+                    else:
+                        signal = -1
+                    len_li = len(_tmp_list[i])
+                    if len_li == 4:
+                        # -0300
+                        setattr(res, offattr, (int(_tmp_list[i][:2]) * 3600 + int(_tmp_list[i][2:]) * 60) * signal)
+                    elif i + 1 < len_l and _tmp_list[i + 1] == ":":
+                        # -03:00
+                        setattr(res, offattr, (int(_tmp_list[i]) * 3600 + int(_tmp_list[i + 2]) * 60) * signal)
+                        used_idxs.append(i)
+                        i += 2
+                    elif len_li <= 2:
+                        # -[0]3
+                        setattr(res, offattr, int(_tmp_list[i][:2]) * 3600 * signal)
+                    else:
+                        return None
+                    used_idxs.append(i)
+                    i += 1
+                if res.dstabbr:
                     break
 
             if i < len_l:

{dateutilx-0.1.1/src/dateutilx → dateutilx-0.2.0/src}/parser/isoparser.py

@@ -8,11 +8,11 @@ ISO-8601 specification.
 """
 
 import calendar
+import datetime as dt
 import re
-from datetime import date, datetime, time, timedelta
 from functools import wraps
 
-from dateutilx.tz import UTC, TzOffset
+from src.tz import UTC, TzOffset
 
 __all__ = ["isoparse", "isoparser"]
 
@@ -21,7 +21,10 @@ def _takes_ascii(f):
     @wraps(f)
     def func(self, str_in, *args, **kwargs):
         # If it's a stream, read the whole thing
-        str_in = getattr(str_in, "read", lambda: str_in)()
+        read = getattr(str_in, "read", None)
+
+        if read is not None:
+            str_in = read()
 
         # If it's unicode, turn it into bytes, since ISO-8601 only covers ASCII
         if isinstance(str_in, str):
@@ -104,10 +107,10 @@ class IsoParser:
         - `±HHMM`
         - `±HH`
 
-        Offsets will be represented as :class:`dateutil.tz.tzoffset` objects,
+        Offsets will be represented as :class:`dateutilx.tz.tzoffset` objects,
         with the exception of UTC, which will be represented as
-        :class:`dateutil.tz.tzutc`. Time zone offsets equivalent to UTC (such
-        as `+00:00`) will also be represented as :class:`dateutil.tz.tzutc`.
+        :class:`dateutilx.tz.tzutc`. Time zone offsets equivalent to UTC (such
+        as `+00:00`) will also be represented as :class:`dateutilx.tz.tzutc`.
 
         :param dt_str:
             A string or stream containing only an ISO-8601 datetime string
@@ -138,9 +141,9 @@ class IsoParser:
 
         if len(components) > 3 and components[3] == 24:
             components[3] = 0
-            return datetime(*components) + timedelta(days=1)
+            return dt.datetime(*components) + dt.timedelta(days=1)
 
-        return datetime(*components)
+        return dt.datetime(*components)
 
     @_takes_ascii
     def parse_isodate(self, datestr):
@@ -156,7 +159,7 @@ class IsoParser:
         components, pos = self._parse_isodate(datestr)
         if pos < len(datestr):
             raise ValueError(f"String contains unknown ISO components: {datestr.decode('ascii')!r}")
-        return date(*components)
+        return dt.date(*components)
 
     @_takes_ascii
     def parse_isotime(self, timestr):
@@ -172,7 +175,7 @@ class IsoParser:
         components = self._parse_isotime(timestr)
         if components[0] == 24:
             components[0] = 0
-        return time(*components)
+        return dt.time(*components)
 
     @_takes_ascii
     def parse_tzstr(self, tzstr, zero_as_utc=True):
@@ -185,11 +188,11 @@ class IsoParser:
             A string representing an ISO time zone offset
 
         :param zero_as_utc:
-            Whether to return :class:`dateutil.tz.tzutc` for zero-offset zones
+            Whether to return :class:`dateutilx.tz.tzutc` for zero-offset zones
 
         :return:
-            Returns :class:`dateutil.tz.tzoffset` for offsets and
-            :class:`dateutil.tz.tzutc` for ``Z`` and (if ``zero_as_utc`` is
+            Returns :class:`dateutilx.tz.tzoffset` for offsets and
+            :class:`dateutilx.tz.tzutc` for ``Z`` and (if ``zero_as_utc`` is
             specified) offsets equivalent to UTC.
         """
         return self._parse_tzstr(tzstr, zero_as_utc=zero_as_utc)
@@ -199,19 +202,19 @@ class IsoParser:
     _TIME_SEP = b":"
     _FRACTION_REGEX = re.compile(b"[.,]([0-9]+)")
 
-    def _parse_isodate(self, dt_str):
+    def _parse_isodate(self, dt_str: str) -> tuple:
+        if len(dt_str) < 4:
+            raise ValueError("ISO string too short")
+
         try:
             return self._parse_isodate_common(dt_str)
         except ValueError:
             return self._parse_isodate_uncommon(dt_str)
 
-    def _parse_isodate_common(self, dt_str):
+    def _parse_isodate_common(self, dt_str: str) -> tuple:
         len_str = len(dt_str)
         components = [1, 1, 1]
 
-        if len_str < 4:
-            raise ValueError("ISO string too short")
-
         # Year
         components[0] = int(dt_str[:4])
         pos = 4
@@ -245,10 +248,7 @@ class IsoParser:
         components[2] = int(dt_str[pos : pos + 2])
         return components, pos + 2
 
-    def _parse_isodate_uncommon(self, dt_str):
-        if len(dt_str) < 4:
-            raise ValueError("ISO string too short")
-
+    def _parse_isodate_uncommon(self, dt_str: str) -> tuple:
         # All ISO formats start with the year
         year = int(dt_str[:4])
 
@@ -283,7 +283,7 @@ class IsoParser:
             if ordinal_day < 1 or ordinal_day > (365 + calendar.isleap(year)):
                 raise ValueError(f"Invalid ordinal day {ordinal_day} for year {year}")
 
-            base_date = date(year, 1, 1) + timedelta(days=ordinal_day - 1)
+            base_date = dt.date(year, 1, 1) + dt.timedelta(days=ordinal_day - 1)
 
         components = [base_date.year, base_date.month, base_date.day]
         return components, pos
@@ -315,12 +315,7 @@ class IsoParser:
             raise ValueError(f"Invalid weekday: {day}")
 
         # Get week 1 for the specific year:
-        jan_4 = date(year, 1, 4)  # Week 1 always has January 4th in it
-        week_1 = jan_4 - timedelta(days=jan_4.isocalendar()[2] - 1)
-
-        # Now add the specific number of weeks and days to get what we want
-        week_offset = (week - 1) * 7 + (day - 1)
-        return week_1 + timedelta(days=week_offset)
+        return dt.date.fromisocalendar(year, week, day)
 
     def _parse_isotime(self, timestr):
         len_str = len(timestr)