Skip to content

fix pythonCollectionFromPropertyList fails on converting dates prior to year 1970 #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZigZagT wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

fix pythonCollectionFromPropertyList fails on converting dates prior to year 1970 #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pyobjc-framework-Cocoa/Lib/PyObjCTools/Conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,11 @@ def pythonCollectionFromPropertyList(aCollection, conversionHelper=None):
elif isinstance(aCollection, Foundation.NSData):
return bytes(aCollection)
elif isinstance(aCollection, Foundation.NSDate):
return datetime.datetime.fromtimestamp(aCollection.timeIntervalSince1970())
timestamp = aCollection.timeIntervalSince1970()
if timestamp < 0:
return datetime.datetime.fromtimestamp(0) - datetime.timedelta(seconds=-timestamp)
else:
return datetime.datetime.fromtimestamp(timestamp)
elif isinstance(aCollection, (objc.pyobjc_unicode, Foundation.NSString)):
return str(aCollection)
elif isinstance(aCollection, OC_PythonLong):
Expand Down
7 changes: 7 additions & 0 deletions pyobjc-framework-Cocoa/PyObjCTest/test_conversion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,13 @@ def test_pythonCollectionFromPropertyList(self):
v = Conversion.pythonCollectionFromPropertyList(value)
self.assertIsInstance(v, datetime.datetime)

with self.subTest("date prior year 1970"):
value = Cocoa.NSDate.dateWithTimeIntervalSince1970_(-10000000000)
self.assertIsInstance(value, Cocoa.NSDate)

v = Conversion.pythonCollectionFromPropertyList(value)
self.assertIsInstance(v, datetime.datetime)

with self.subTest("decimal"):
value = Cocoa.NSDecimalNumber.decimalNumberWithString_("42.5")
self.assertIsInstance(value, Cocoa.NSDecimalNumber)
Expand Down