From: Sergey M․ Date: Sun, 11 Jun 2017 14:27:22 +0000 (+0700) Subject: [utils] Improve unified_timestamp X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2ae2ffda5eae9c64d40d2fec839ba5deb07717f2;p=youtube-dl [utils] Improve unified_timestamp --- diff --git a/test/test_utils.py b/test/test_utils.py index d7e05817c..41b094d89 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -340,6 +340,7 @@ class TestUtil(unittest.TestCase): self.assertEqual(unified_timestamp('May 16, 2016 11:15 PM'), 1463440500) self.assertEqual(unified_timestamp('Feb 7, 2016 at 6:35 pm'), 1454870100) self.assertEqual(unified_timestamp('2017-03-30T17:52:41Q'), 1490896361) + self.assertEqual(unified_timestamp('Sep 11, 2013 | 5:49 AM'), 1378878540) 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 d79410e58..16bf49408 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1179,7 +1179,7 @@ def unified_timestamp(date_str, day_first=True): if date_str is None: return None - date_str = date_str.replace(',', ' ') + date_str = re.sub(r'[,|]', '', date_str) pm_delta = 12 if re.search(r'(?i)PM', date_str) else 0 timezone, date_str = extract_timezone(date_str)