stack/erp5: backport DateTime fixes

component/egg-patch/DateTime/0001-Cast-int-to-float-in-compare-methods.patch

+From a02c80e17f794dc5eaea1c4edd3a2a3277a13638 Mon Sep 17 00:00:00 2001
+From: Kazuhiko SHIOZAKI <kazuhiko@nexedi.com>
+Date: Tue, 18 Jul 2023 10:26:54 +0200
+Subject: [PATCH 1/4] Cast int to float in compare methods.
+
+---
+ src/DateTime/DateTime.py            | 30 ++++++++++-------------------
+ src/DateTime/tests/test_datetime.py | 17 ++++++++++++++++
+ 2 files changed, 27 insertions(+), 20 deletions(-)
+
+diff --git a/src/DateTime/DateTime.py b/src/DateTime/DateTime.py
+index 2d2d97f..c141306 100644
+--- a/src/DateTime/DateTime.py
++++ b/src/DateTime/DateTime.py
+@@ -1256,12 +1256,10 @@ class DateTime(object):
+         """
+         if t is None:
+             t = 0
+-        if isinstance(t, float):
++        if isinstance(t, (float, int)):
+             return self._micros > long(t * 1000000)
+-        try:
++        else:
+             return self._micros > t._micros
+-        except AttributeError:
+-            return self._micros > t
+ 
+     __gt__ = greaterThan
+ 
+@@ -1279,12 +1277,10 @@ class DateTime(object):
+         """
+         if t is None:
+             t = 0
+-        if isinstance(t, float):
++        if isinstance(t, (float, int)):
+             return self._micros >= long(t * 1000000)
+-        try:
++        else:
+             return self._micros >= t._micros
+-        except AttributeError:
+-            return self._micros >= t
+ 
+     __ge__ = greaterThanEqualTo
+ 
+@@ -1301,12 +1297,10 @@ class DateTime(object):
+         """
+         if t is None:
+             t = 0
+-        if isinstance(t, float):
++        if isinstance(t, (float, int)):
+             return self._micros == long(t * 1000000)
+-        try:
++        else:
+             return self._micros == t._micros
+-        except AttributeError:
+-            return self._micros == t
+ 
+     def notEqualTo(self, t):
+         """Compare this DateTime object to another DateTime object
+@@ -1348,12 +1342,10 @@ class DateTime(object):
+         """
+         if t is None:
+             t = 0
+-        if isinstance(t, float):
++        if isinstance(t, (float, int)):
+             return self._micros < long(t * 1000000)
+-        try:
++        else:
+             return self._micros < t._micros
+-        except AttributeError:
+-            return self._micros < t
+ 
+     __lt__ = lessThan
+ 
+@@ -1370,12 +1362,10 @@ class DateTime(object):
+         """
+         if t is None:
+             t = 0
+-        if isinstance(t, float):
++        if isinstance(t, (float, int)):
+             return self._micros <= long(t * 1000000)
+-        try:
++        else:
+             return self._micros <= t._micros
+-        except AttributeError:
+-            return self._micros <= t
+ 
+     __le__ = lessThanEqualTo
+ 
+diff --git a/src/DateTime/tests/test_datetime.py b/src/DateTime/tests/test_datetime.py
+index 249e79a..e6b3f93 100644
+--- a/src/DateTime/tests/test_datetime.py
++++ b/src/DateTime/tests/test_datetime.py
+@@ -228,6 +228,23 @@ class DateTimeTests(unittest.TestCase):
+         self.assertTrue(dt.lessThanEqualTo(dt1))
+         self.assertTrue(dt.notEqualTo(dt1))
+         self.assertFalse(dt.equalTo(dt1))
++        # Compare a date to float
++        dt = DateTime(1.0)
++        self.assertFalse(dt.greaterThan(1.0))
++        self.assertTrue(dt.greaterThanEqualTo(1.0))
++        self.assertFalse(dt.lessThan(1.0))
++        self.assertTrue(dt.lessThanEqualTo(1.0))
++        self.assertFalse(dt.notEqualTo(1.0))
++        self.assertTrue(dt.equalTo(1.0))
++        # Compare a date to int
++        dt = DateTime(1)
++        self.assertEqual(dt, DateTime(1.0))
++        self.assertFalse(dt.greaterThan(1))
++        self.assertTrue(dt.greaterThanEqualTo(1))
++        self.assertFalse(dt.lessThan(1))
++        self.assertTrue(dt.lessThanEqualTo(1))
++        self.assertFalse(dt.notEqualTo(1))
++        self.assertTrue(dt.equalTo(1))
+ 
+     def test_compare_methods_none(self):
+         # Compare a date to None
+-- 
+2.40.1
+

component/egg-patch/DateTime/0002-Fix-compare-methods-between-DateTime-0-and-None-fix-.patch

+From 892e66132025ab8c213e4be57dd10f0f8eec7e60 Mon Sep 17 00:00:00 2001
+From: Kazuhiko SHIOZAKI <kazuhiko@nexedi.com>
+Date: Fri, 14 Jul 2023 21:10:06 +0200
+Subject: [PATCH 2/4] Fix compare methods between DateTime(0) and None (fix
+ #52).
+
+This is a fixup commit of 'further py3 work' that changed the behaviour of compare methods between DateTime(0) and None.
+Now None is less than any DateTime instance including DateTime(0), just same as DateTime 2.
+---
+ src/DateTime/DateTime.py            | 10 +++++-----
+ src/DateTime/tests/test_datetime.py | 14 +++++++-------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/src/DateTime/DateTime.py b/src/DateTime/DateTime.py
+index c141306..caf67e1 100644
+--- a/src/DateTime/DateTime.py
++++ b/src/DateTime/DateTime.py
+@@ -1255,7 +1255,7 @@ class DateTime(object):
+         long integer microseconds.
+         """
+         if t is None:
+-            t = 0
++            return True
+         if isinstance(t, (float, int)):
+             return self._micros > long(t * 1000000)
+         else:
+@@ -1276,7 +1276,7 @@ class DateTime(object):
+         long integer microseconds.
+         """
+         if t is None:
+-            t = 0
++            return True
+         if isinstance(t, (float, int)):
+             return self._micros >= long(t * 1000000)
+         else:
+@@ -1296,7 +1296,7 @@ class DateTime(object):
+         long integer microseconds.
+         """
+         if t is None:
+-            t = 0
++            return False
+         if isinstance(t, (float, int)):
+             return self._micros == long(t * 1000000)
+         else:
+@@ -1341,7 +1341,7 @@ class DateTime(object):
+         long integer microseconds.
+         """
+         if t is None:
+-            t = 0
++            return False
+         if isinstance(t, (float, int)):
+             return self._micros < long(t * 1000000)
+         else:
+@@ -1361,7 +1361,7 @@ class DateTime(object):
+         long integer microseconds.
+         """
+         if t is None:
+-            t = 0
++            return False
+         if isinstance(t, (float, int)):
+             return self._micros <= long(t * 1000000)
+         else:
+diff --git a/src/DateTime/tests/test_datetime.py b/src/DateTime/tests/test_datetime.py
+index e6b3f93..1dd6c32 100644
+--- a/src/DateTime/tests/test_datetime.py
++++ b/src/DateTime/tests/test_datetime.py
+@@ -248,13 +248,13 @@ class DateTimeTests(unittest.TestCase):
+ 
+     def test_compare_methods_none(self):
+         # Compare a date to None
+-        dt = DateTime('1997/1/1')
+-        self.assertTrue(dt.greaterThan(None))
+-        self.assertTrue(dt.greaterThanEqualTo(None))
+-        self.assertFalse(dt.lessThan(None))
+-        self.assertFalse(dt.lessThanEqualTo(None))
+-        self.assertTrue(dt.notEqualTo(None))
+-        self.assertFalse(dt.equalTo(None))
++        for dt in (DateTime('1997/1/1'), DateTime(0)):
++            self.assertTrue(dt.greaterThan(None))
++            self.assertTrue(dt.greaterThanEqualTo(None))
++            self.assertFalse(dt.lessThan(None))
++            self.assertFalse(dt.lessThanEqualTo(None))
++            self.assertTrue(dt.notEqualTo(None))
++            self.assertFalse(dt.equalTo(None))
+ 
+     def test_pickle(self):
+         dt = DateTime()
+-- 
+2.40.1
+

component/egg-patch/DateTime/0003-Make-it-possible-to-pickle-datetimes-returned-by-asd.patch

+From 4a9798072c87d2fe53b2e1e15b004ff982f9686a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Thu, 30 Nov 2023 06:19:54 +0100
+Subject: [PATCH 3/4] Make it possible to pickle datetimes returned by
+ asdatetime
+
+Fixes #58
+---
+ src/DateTime/pytz_support.py        | 5 +++++
+ src/DateTime/tests/test_datetime.py | 7 +++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/src/DateTime/pytz_support.py b/src/DateTime/pytz_support.py
+index 9ebf3db..e0746ea 100644
+--- a/src/DateTime/pytz_support.py
++++ b/src/DateTime/pytz_support.py
+@@ -199,9 +199,14 @@ for hour in range(0, 13):
+     _old_zmap['+%s00' % fhour] = 'GMT+%i' % hour
+ 
+ 
++def _p(zone):
++    return _numeric_timezones[zone]
++
++
+ def _static_timezone_factory(data):
+     zone = data[0]
+     cls = type(zone, (StaticTzInfo,), dict(
++        __reduce__=lambda _: (_p, (zone, )),
+         zone=zone,
+         _utcoffset=memorized_timedelta(data[5][0][0]),
+         _tzname=data[6][:-1]))  # strip the trailing null
+diff --git a/src/DateTime/tests/test_datetime.py b/src/DateTime/tests/test_datetime.py
+index 1dd6c32..b9eeea9 100644
+--- a/src/DateTime/tests/test_datetime.py
++++ b/src/DateTime/tests/test_datetime.py
+@@ -270,6 +270,13 @@ class DateTimeTests(unittest.TestCase):
+         for key in DateTime.__slots__:
+             self.assertEqual(getattr(dt, key), getattr(new, key))
+ 
++    def test_pickle_asdatetime_with_tz(self):
++        dt = DateTime('2002/5/2 8:00am GMT+8')
++        data = pickle.dumps(dt.asdatetime(), 1)
++        new = DateTime(pickle.loads(data))
++        for key in DateTime.__slots__:
++            self.assertEqual(getattr(dt, key), getattr(new, key))
++
+     def test_pickle_with_numerical_tz(self):
+         for dt_str in ('2007/01/02 12:34:56.789 +0300',
+                        '2007/01/02 12:34:56.789 +0430',
+-- 
+2.40.1
+

component/egg-patch/DateTime/0004-Repair-equality-comparison-between-DateTime-instance.patch

+From 6ac321746ab86374871623ddaf414b7948325d22 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Sun, 3 Dec 2023 15:57:01 +0100
+Subject: [PATCH 4/4] Repair equality comparison between DateTime instances and
+ other types
+
+Fixes #60
+---
+ src/DateTime/DateTime.py            | 20 +++++++++++++++-----
+ src/DateTime/tests/test_datetime.py | 17 +++++++++++++++++
+ 2 files changed, 32 insertions(+), 5 deletions(-)
+
+diff --git a/src/DateTime/DateTime.py b/src/DateTime/DateTime.py
+index caf67e1..84570b9 100644
+--- a/src/DateTime/DateTime.py
++++ b/src/DateTime/DateTime.py
+@@ -1258,8 +1258,10 @@ class DateTime(object):
+             return True
+         if isinstance(t, (float, int)):
+             return self._micros > long(t * 1000000)
+-        else:
++        try:
+             return self._micros > t._micros
++        except AttributeError:
++            return self._micros > t
+ 
+     __gt__ = greaterThan
+ 
+@@ -1279,8 +1281,10 @@ class DateTime(object):
+             return True
+         if isinstance(t, (float, int)):
+             return self._micros >= long(t * 1000000)
+-        else:
++        try:
+             return self._micros >= t._micros
++        except AttributeError:
++            return self._micros >= t
+ 
+     __ge__ = greaterThanEqualTo
+ 
+@@ -1299,8 +1303,10 @@ class DateTime(object):
+             return False
+         if isinstance(t, (float, int)):
+             return self._micros == long(t * 1000000)
+-        else:
++        try:
+             return self._micros == t._micros
++        except AttributeError:
++            return self._micros == t
+ 
+     def notEqualTo(self, t):
+         """Compare this DateTime object to another DateTime object
+@@ -1344,8 +1350,10 @@ class DateTime(object):
+             return False
+         if isinstance(t, (float, int)):
+             return self._micros < long(t * 1000000)
+-        else:
++        try:
+             return self._micros < t._micros
++        except AttributeError:
++            return self._micros < t
+ 
+     __lt__ = lessThan
+ 
+@@ -1364,8 +1372,10 @@ class DateTime(object):
+             return False
+         if isinstance(t, (float, int)):
+             return self._micros <= long(t * 1000000)
+-        else:
++        try:
+             return self._micros <= t._micros
++        except AttributeError:
++            return self._micros <= t
+ 
+     __le__ = lessThanEqualTo
+ 
+diff --git a/src/DateTime/tests/test_datetime.py b/src/DateTime/tests/test_datetime.py
+index b9eeea9..970a072 100644
+--- a/src/DateTime/tests/test_datetime.py
++++ b/src/DateTime/tests/test_datetime.py
+@@ -230,6 +230,8 @@ class DateTimeTests(unittest.TestCase):
+         self.assertFalse(dt.equalTo(dt1))
+         # Compare a date to float
+         dt = DateTime(1.0)
++        self.assertTrue(dt == DateTime(1.0))  # testing __eq__
++        self.assertFalse(dt != DateTime(1.0))  # testing __ne__
+         self.assertFalse(dt.greaterThan(1.0))
+         self.assertTrue(dt.greaterThanEqualTo(1.0))
+         self.assertFalse(dt.lessThan(1.0))
+@@ -239,12 +241,27 @@ class DateTimeTests(unittest.TestCase):
+         # Compare a date to int
+         dt = DateTime(1)
+         self.assertEqual(dt, DateTime(1.0))
++        self.assertTrue(dt == DateTime(1))  # testing __eq__
++        self.assertFalse(dt != DateTime(1))  # testing __ne__
+         self.assertFalse(dt.greaterThan(1))
+         self.assertTrue(dt.greaterThanEqualTo(1))
+         self.assertFalse(dt.lessThan(1))
+         self.assertTrue(dt.lessThanEqualTo(1))
+         self.assertFalse(dt.notEqualTo(1))
+         self.assertTrue(dt.equalTo(1))
++        # Compare a date to string; there is no implicit type conversion
++        # but behavior if consistent as when comparing, for example, an int
++        # and a string.
++        dt = DateTime("2023")
++        self.assertFalse(dt == "2023")  # testing __eq__
++        self.assertTrue(dt != "2023")  # testing __ne__
++        if sys.version_info > (3, ):
++            self.assertRaises(TypeError, dt.greaterThan, "2023")
++            self.assertRaises(TypeError, dt.greaterThanEqualTo, "2023")
++            self.assertRaises(TypeError, dt.lessThan, "2023")
++            self.assertRaises(TypeError, dt.lessThanEqualTo, "2023")
++        self.assertTrue(dt.notEqualTo("2023"))
++        self.assertFalse(dt.equalTo("2023"))
+ 
+     def test_compare_methods_none(self):
+         # Compare a date to None
+-- 
+2.40.1
+

stack/erp5/buildout.cfg

@@ -687,6 +687,12 @@ extra-paths =
 patch-binary = ${patch:location}/bin/patch
 Acquisition-patches = ${:_profile_base_location_}/../../component/egg-patch/Acquisition/aq_dynamic-4.7.patch#85b0090e216cead0fc86c5c274450d96
 Acquisition-patch-options = -p1
+DateTime-patches =
+  ${:_profile_base_location_}/../../component/egg-patch/DateTime/0001-Cast-int-to-float-in-compare-methods.patch#9898a58ce90dd31c884a7183aeec4361
+  ${:_profile_base_location_}/../../component/egg-patch/DateTime/0002-Fix-compare-methods-between-DateTime-0-and-None-fix-.patch#733903a564c8b14df65c45c4f2eec262
+  ${:_profile_base_location_}/../../component/egg-patch/DateTime/0003-Make-it-possible-to-pickle-datetimes-returned-by-asd.patch#e94a71ef40de130720e621e296537000
+  ${:_profile_base_location_}/../../component/egg-patch/DateTime/0004-Repair-equality-comparison-between-DateTime-instance.patch#ea146c00dfbc31c7d96af8abc6f0b301
+DateTime-patch-options = -p1
 Products.BTreeFolder2-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.BTreeFolder2/0001-Add-a-confirmation-prompt-on-Delete-All-Objects-butt.patch#44de3abf382e287b8766c2f29ec1cf74
 Products.BTreeFolder2-patch-options = -p1
 Products.CMFCore-patches = ${:_profile_base_location_}/../../component/egg-patch/Products.CMFCore/portal_skins_ZMI_find.patch#19ec05c0477c50927ee1df6eb75d1e7f
@@ -743,6 +749,7 @@ depends =
 
 # patched eggs
 Acquisition = 4.7+SlapOSPatched001
+DateTime = 4.9+SlapOSPatched004
 Products.DCWorkflow = 2.4.1+SlapOSPatched001
 ocropy = 1.0+SlapOSPatched001
 PyPDF2 = 1.26.0+SlapOSPatched002