projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[utils] Fix unified_timestamp for formats parsed by parsedate_tz()
[youtube-dl]
/
youtube_dl
/
utils.py
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index f5cd6819b4b51942e3fa273d1987debb6f8333ed..97ddd988398993e7858651b77bf19ef72efe3a7c 100644
(file)
--- 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(',', ' ')
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
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:
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(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'):
def determine_ext(url, default_ext='unknown_video'):