diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-08-05 11:41:55 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-08-05 11:41:55 +0800 |
| commit | 7dc2a74e0ac9cfa74cc9de6f586ffd5cc8bac0d9 (patch) | |
| tree | a296e66e2fa5cd3a352ffdcabb2018fbb4199e05 | |
| parent | b02b960c6bba834d9e7199ac53430c7933079dc8 (diff) | |
| download | youtube-dl-7dc2a74e0ac9cfa74cc9de6f586ffd5cc8bac0d9.tar.xz | |
[utils] Fix unified_timestamp for formats parsed by parsedate_tz()
| -rw-r--r-- | test/test_utils.py | 1 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index 2273b5a10..5a2ae4a1e 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -308,6 +308,7 @@ class TestUtil(unittest.TestCase): self.assertEqual(unified_timestamp('25-09-2014'), 1411603200) self.assertEqual(unified_timestamp('27.02.2016 17:30'), 1456594200) self.assertEqual(unified_timestamp('UNKNOWN DATE FORMAT'), None) + self.assertEqual(unified_timestamp('May 16, 2016 11:15 PM'), 1463440500) def test_determine_ext(self): self.assertEqual(determine_ext('http://example.com/foo/bar.mp4/?download'), 'mp4') diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index f5cd6819b..97ddd9883 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1101,7 +1101,7 @@ def unified_timestamp(date_str, day_first=True): date_str = date_str.replace(',', ' ') - pm_delta = datetime.timedelta(hours=12 if re.search(r'(?i)PM', date_str) else 0) + pm_delta = 12 if re.search(r'(?i)PM', date_str) else 0 timezone, date_str = extract_timezone(date_str) # Remove AM/PM + timezone @@ -1109,13 +1109,13 @@ def unified_timestamp(date_str, day_first=True): for expression in date_formats(day_first): try: - dt = datetime.datetime.strptime(date_str, expression) - timezone + pm_delta + dt = datetime.datetime.strptime(date_str, expression) - timezone + datetime.timedelta(hours=pm_delta) return calendar.timegm(dt.timetuple()) except ValueError: pass timetuple = email.utils.parsedate_tz(date_str) if timetuple: - return calendar.timegm(timetuple.timetuple()) + return calendar.timegm(timetuple) + pm_delta * 3600 def determine_ext(url, default_ext='unknown_video'): |