Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-25 12:12:34 +01:00
Code Issues Releases Wiki Activity

use 'utcfromtimestamp()'

Browse Source 
'fromtimestamp()' converts its results to the local timezone and causes
problems when running tests on a different machine.
This commit is contained in:
Mike Fährmann 2019-04-21 16:22:53 +02:00
parent d84e7c6861
commit 6264a46212
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gallery_dl/extractor/twitter.py
View File

@ -134,7 +134,7 @@ class TwitterTimelineExtractor(TwitterExtractor):
test = ("https://twitter.com/PicturesEarth", { test = ("https://twitter.com/PicturesEarth", {
"range": "1-40", "range": "1-40",
"url": "2f4d51cbba81e56c1c755677b3ad58fc167c9771", "url": "2f4d51cbba81e56c1c755677b3ad58fc167c9771",
"keyword": "d406beda07f6f644abd460ddb9af2469ee65c187", "keyword": "46f680d81a59e4d0e8b4ac25411bc3ec94c73a93",
}) })
def tweets(self): def tweets(self):
@ -167,13 +167,13 @@ class TwitterTweetExtractor(TwitterExtractor):
test = ( test = (
("https://twitter.com/PicturesEarth/status/672897688871018500", { ("https://twitter.com/PicturesEarth/status/672897688871018500", {
"url": "d9e68d41301d2fe382eb27711dea28366be03b1a", "url": "d9e68d41301d2fe382eb27711dea28366be03b1a",
"keyword": "64353df74105fa8814319fdcd3c34575195c39cc", "keyword": "da59634e33a7210bd24f9152af9ac560f6b1b601",
"content": "a1f2f04cb2d8df24b1afa7a39910afda23484342", "content": "a1f2f04cb2d8df24b1afa7a39910afda23484342",
}), }),
# 4 images # 4 images
("https://twitter.com/perrypumas/status/894001459754180609", { ("https://twitter.com/perrypumas/status/894001459754180609", {
"url": "c8a262a9698cb733fb27870f5a8f75faf77d79f6", "url": "c8a262a9698cb733fb27870f5a8f75faf77d79f6",
"keyword": "6616de44cf8f87226047ef673e528233f76735d0", "keyword": "43d98ab448193f0d4f30aa571a4b6bda9b6a5692",
}), }),
# video # video
("https://twitter.com/perrypumas/status/1065692031626829824", { ("https://twitter.com/perrypumas/status/1065692031626829824", {

2
gallery_dl/text.py
View File

@ -218,7 +218,7 @@ def parse_query(qs):
def parse_timestamp(ts, default=None): def parse_timestamp(ts, default=None):
"""Create a datetime object from a unix timestamp""" """Create a datetime object from a unix timestamp"""
try: try:
return datetime.datetime.fromtimestamp(int(ts)) return datetime.datetime.utcfromtimestamp(int(ts))
except (TypeError, ValueError, OverflowError): except (TypeError, ValueError, OverflowError):
return default return default

4
test/test_text.py
View File

@ -338,8 +338,8 @@ class TestText(unittest.TestCase):
self.assertEqual(f(value), {}) self.assertEqual(f(value), {})
def test_parse_timestamp(self, f=text.parse_timestamp): def test_parse_timestamp(self, f=text.parse_timestamp):
null = datetime.datetime.fromtimestamp(0) null = datetime.datetime.utcfromtimestamp(0)
value = datetime.datetime.fromtimestamp(1555816235) value = datetime.datetime.utcfromtimestamp(1555816235)
self.assertEqual(f(0) , null) self.assertEqual(f(0) , null)
self.assertEqual(f("0") , null) self.assertEqual(f("0") , null)