aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2017-04-30 21:07:30 +0700
committerSergey M․ <dstftw@gmail.com>2017-04-30 21:45:53 +0700
commitdeef31955bb6106939606cd2a8b677db700055e3 (patch)
treec01db015e2d80f4d26d0e09290220a34a8c3c8f6 /youtube_dl
parent9dac2cec2d7e31b65cf063164b3a99f257a86a63 (diff)
[utils] Improve unified_timestamp
Seen at http://zaq1.pl/video/xev0e
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/utils.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 9d7798ee8..86fc5ccac 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -1194,6 +1194,11 @@ def unified_timestamp(date_str, day_first=True):
# Remove AM/PM + timezone
date_str = re.sub(r'(?i)\s*(?:AM|PM)(?:\s+[A-Z]+)?', '', date_str)
+ # Remove unrecognized timezones from ISO 8601 alike timestamps
+ m = re.search(r'\d{1,2}:\d{1,2}(?:\.\d+)?(?P<tz>\s*[A-Z]+)$', date_str)
+ if m:
+ date_str = date_str[:-len(m.group('tz'))]
+
for expression in date_formats(day_first):
try:
dt = datetime.datetime.strptime(date_str, expression) - timezone + datetime.timedelta(hours=pm_delta)