mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpo-37915: Fix comparison between tzinfo objects and timezone objects (GH-15390) 

https://bugs.python.org/issue37915



Automerge-Triggered-By: @pablogsal
This commit is contained in:
Pablo Galindo 2019-08-22 20:24:25 +01:00 committed by Miss Islington (bot)
parent 8889627b53
commit 4be11c009a
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/datetimetester.py
View File

@ -413,6 +413,11 @@ def test_offset_boundaries(self):
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
timezone(delta) timezone(delta)
def test_comparison_with_tzinfo(self):
# Constructing tzinfo objects directly should not be done by users
# and serves only to check the bug described in bpo-37915
self.assertNotEqual(timezone.utc, tzinfo())
self.assertNotEqual(timezone(timedelta(hours=1)), tzinfo())
############################################################################# #############################################################################
# Base class for testing a particular aspect of timedelta, time, date and # Base class for testing a particular aspect of timedelta, time, date and

3
Misc/NEWS.d/next/Library/2019-08-22-16-13-27.bpo-37915.xyoZI5.rst Normal file
View File

@ -0,0 +1,3 @@
Fix a segmentation fault that appeared when comparing instances of
``datetime.timezone`` and ``datetime.tzinfo`` objects. Patch by Pablo
Galindo.

3
Modules/_datetimemodule.c
View File

@ -32,6 +32,7 @@
#define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType) #define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType)
#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TZInfoType) #define PyTZInfo_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TZInfoType)
#define PyTimezone_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeZoneType)
/*[clinic input] /*[clinic input]
module datetime module datetime
@ -3745,7 +3746,7 @@ timezone_richcompare(PyDateTime_TimeZone *self,
{ {
if (op != Py_EQ && op != Py_NE) if (op != Py_EQ && op != Py_NE)
Py_RETURN_NOTIMPLEMENTED; Py_RETURN_NOTIMPLEMENTED;
if (!PyTZInfo_Check(other)) { if (!PyTimezone_Check(other)) {
Py_RETURN_NOTIMPLEMENTED; Py_RETURN_NOTIMPLEMENTED;
} }
return delta_richcompare(self->offset, other->offset, op); return delta_richcompare(self->offset, other->offset, op);