opendate 0.1.9__tar.gz → 0.1.11__tar.gz

{opendate-0.1.9 → opendate-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: opendate
-Version: 0.1.9
+Version: 0.1.11
 Summary: Python business datetimes
 Home-page: https://github.com/bissli/opendate
 License: MIT

{opendate-0.1.9 → opendate-0.1.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "opendate"
-version = "0.1.9"
+version = "0.1.11"
 description = "Python business datetimes"
 authors = ["bissli <bissli.xyz@protonmail.com>"]
 readme = "README.md"

{opendate-0.1.9 → opendate-0.1.11}/src/date/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.9'
+__version__ = '0.1.11'
 
 import datetime as _datetime
 
@@ -51,6 +51,10 @@ def time(*args, **kwargs):
     return Time(*args, **kwargs)
 
 
+def interval(*args, **kwargs):
+    return Interval(*args, **kwargs)
+
+
 def parse(s: str | None, fmt: str = None, entity: Entity = NYSE, raise_err: bool = False) -> DateTime | None:
     """Parse using DateTime.parse
     """
@@ -60,14 +64,13 @@ def parse(s: str | None, fmt: str = None, entity: Entity = NYSE, raise_err: bool
 def instance(obj: _datetime.date | _datetime.datetime | _datetime.time) -> DateTime | Date | Time:
     """Create a DateTime/Date/Time instance from a datetime/date/time native one.
     """
-    if isinstance(obj, DateTime | Date | Time):
-        return obj
     if isinstance(obj, _datetime.date) and not isinstance(obj, _datetime.datetime):
         return Date.instance(obj)
     if isinstance(obj, _datetime.time):
         return Time.instance(obj)
     if isinstance(obj, _datetime.datetime):
         return DateTime.instance(obj)
+    raise ValueError(f'opendate `instance` helper cannot parse type {type(obj)}')
 
 
 def now(tz: str | _zoneinfo.ZoneInfo | None = None) -> DateTime:
@@ -84,28 +87,30 @@ def today(tz: str | _zoneinfo.ZoneInfo = None) -> DateTime:
 
 __all__ = [
     'Date',
+    'date',
     'DateTime',
+    'datetime',
+    'Entity',
+    'expect_date',
+    'expect_datetime',
+    'expect_native_timezone',
+    'expect_utc_timezone',
+    'instance',
     'Interval',
+    'interval',
     'IntervalError',
-    'Time',
-    'WeekDay',
+    'is_business_day',
+    'is_within_business_hours',
+    'LCL',
     'now',
-    'today',
+    'NYSE',
+    'overlap_days',
     'parse',
-    'LCL',
-    'timezone',
-    'expect_native_timezone',
-    'expect_utc_timezone',
     'prefer_native_timezone',
     'prefer_utc_timezone',
-    'expect_date',
-    'expect_datetime',
-    'Entity',
-    'NYSE',
-    'date',
-    'datetime',
+    'Time',
     'time',
-    'overlap_days',
-    'is_within_business_hours',
-    'is_business_day',
+    'timezone',
+    'today',
+    'WeekDay',
     ]

{opendate-0.1.9 → opendate-0.1.11}/src/date/date.py

@@ -787,8 +787,18 @@ class Date(DateExtrasMixin, DateBusinessMixin, _pendulum.Date):
             raise TypeError(f'Invalid type for date parse: {s.__class__}')
 
         if fmt:
-            with contextlib.suppress(ValueError):
+            try:
                 return cls(*time.strptime(s, fmt)[:3])
+            except:
+                if raise_err:
+                    raise ValueError(f'Unable to parse {s} using fmt {fmt}')
+                return
+
+        with contextlib.suppress(ValueError):
+            if float(s) and not len(s) == 8: # 20000101
+                if raise_err:
+                    raise ValueError('Invalid date: %s', s)
+                return
 
         # special shortcode symbolic values: T, Y-2, P-1b
         if m := DATEMATCH.match(s):
@@ -810,7 +820,7 @@ class Date(DateExtrasMixin, DateBusinessMixin, _pendulum.Date):
             return cls.today().subtract(days=1)
 
         with contextlib.suppress(TypeError, ValueError):
-            return cls.instance(_dateutil.parser.parse(s).date())
+            return cls.instance(_dateutil.parser.parse(s))
 
         # Regex with Month Numbers
         exps = (
@@ -1010,7 +1020,12 @@ class Time(_pendulum.Time):
             raise TypeError(f'Invalid type for time parse: {s.__class__}')
 
         if fmt:
-            return cls(*time.strptime(s, fmt)[3:6])
+            try:
+                return cls(*time.strptime(s, fmt)[3:6])
+            except:
+                if raise_err:
+                    raise ValueError(f'Unable to parse {s} using fmt {fmt}')
+                return
 
         exps = (
             r'^(?P<h>\d{1,2})[:.](?P<m>\d{2})([:.](?P<s>\d{2})([.,](?P<u>\d+))?)?( +(?P<ap>[aApP][mM]))?$',
@@ -1028,7 +1043,7 @@ class Time(_pendulum.Time):
                 return cls(hh, mm, ss, uu * 1000)
 
         with contextlib.suppress(TypeError, ValueError):
-            return cls.instance(_dateutil.parser.parse(s).time())
+            return cls.instance(_dateutil.parser.parse(s))
 
         if raise_err:
             raise ValueError('Failed to parse time: %s', s)
@@ -1177,7 +1192,7 @@ class DateTime(DateBusinessMixin, _pendulum.DateTime):
         UTC time technically equals GMT
         >>> this_utc = DateTime.parse('Fri, 31 Oct 2014 18:55:00 GMT')
         >>> this_utc
-        DateTime(2014, 10, 31, 18, 55, 0, tzinfo=Timezone('UTC'))
+        DateTime(2014, 10, 31, 18, 55, 0, tzinfo=tzutc())
 
         We can freely compare time zones
         >>> this_est1==this_est2==this_utc
@@ -1205,8 +1220,7 @@ class DateTime(DateBusinessMixin, _pendulum.DateTime):
             return cls.parse(iso).replace(tzinfo=LCL)
 
         with contextlib.suppress(ValueError, TypeError):
-            obj = _dateutil.parser.parse(s)
-            return cls.instance(_pendulum.instance(obj))
+            return cls.instance(_dateutil.parser.parse(s))
 
         for delim in (' ', ':'):
             bits = s.split(delim, 1)
@@ -1356,12 +1370,29 @@ class Interval:
           set  -  set    end=beg + num
            -  set set    beg=end - num
 
-        >>> Interval('4/3/2014', None).b.range(3)
+        Basic/legacy cases
+        >>> Interval(Date(2014, 4, 3), None).b.range(3)
         (Date(2014, 4, 3), Date(2014, 4, 8))
         >>> Interval(None, Date(2014, 7, 27)).range(20)
         (Date(2014, 7, 7), Date(2014, 7, 27))
-        >>> Interval(None, '2014/7/27').b.range(20)
+        >>> Interval(None, Date(2014, 7, 27)).b.range(20)
         (Date(2014, 6, 27), Date(2014, 7, 27))
+
+        Do not modify dates if both are provided
+        >>> Interval(Date(2024, 7, 25), Date(2024, 7, 25)).b.range(None)
+        (Date(2024, 7, 25), Date(2024, 7, 25))
+        >>> Interval(Date(2024, 7, 27), Date(2024, 7, 27)).b.range(None)
+        (Date(2024, 7, 27), Date(2024, 7, 27))
+
+        Edge cases (7/27/24 is weekend)
+        >>> Interval(Date(2024, 7, 27), None).b.range(0)
+        (Date(2024, 7, 27), Date(2024, 7, 27))
+        >>> Interval(None, Date(2024, 7, 27)).b.range(0)
+        (Date(2024, 7, 27), Date(2024, 7, 27))
+        >>> Interval(Date(2024, 7, 27), None).b.range(1)
+        (Date(2024, 7, 27), Date(2024, 7, 29))
+        >>> Interval(None, Date(2024, 7, 27)).b.range(1)
+        (Date(2024, 7, 26), Date(2024, 7, 27))
         """
         begdate, enddate = self.begdate, self.enddate
 
@@ -1375,17 +1406,14 @@ class Interval:
             raise IntervalError('Missing begdate and enddate, window specified')
 
         if begdate and enddate:
-            return (begdate.business() if begdate._business else
-                    begdate).add(days=window), \
-                   (enddate.business() if enddate._business else
-                    enddate).subtract(days=0)
-
-        if (not begdate and not enddate) or enddate:
-            begdate = (enddate.business() if enddate._business else
-                       enddate).subtract(days=window)
+            pass  # do nothing if both provided
+        elif (not begdate and not enddate) or enddate:
+            begdate = enddate.subtract(days=window) if window else enddate
         else:
-            enddate = (begdate.business() if begdate._business else
-                       begdate).add(days=window)
+            enddate = begdate.add(days=window) if window else begdate
+
+        enddate._business = False
+        begdate._business = False
 
         return begdate, enddate
 
@@ -1491,13 +1519,13 @@ class Interval:
     def days(self) -> int:
         """Return days between (begdate, enddate] or negative (enddate, begdate].
 
-        >>> Interval(Date.parse('2018/9/6'), Date.parse('2018/9/10')).days()
+        >>> Interval(Date(2018, 9, 6), Date(2018, 9, 10)).days()
         4
-        >>> Interval(Date.parse('2018/9/10'), Date.parse('2018/9/6')).days()
+        >>> Interval(Date(2018, 9, 10), Date(2018, 9, 6)).days()
         -4
-        >>> Interval(Date.parse('2018/9/6'), Date.parse('2018/9/10')).b.days()
+        >>> Interval(Date(2018, 9, 6), Date(2018, 9, 10)).b.days()
         2
-        >>> Interval(Date.parse('2018/9/10'), Date.parse('2018/9/6')).b.days()
+        >>> Interval(Date(2018, 9, 10), Date(2018, 9, 6)).b.days()
         -2
         """
         assert self.begdate