]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[utils] Avoid treating `*-%Y` date template as UTC offset
authorSergey M․ <dstftw@gmail.com>
Sat, 4 Apr 2015 13:08:48 +0000 (19:08 +0600)
committerSergey M․ <dstftw@gmail.com>
Sat, 4 Apr 2015 13:08:48 +0000 (19:08 +0600)
youtube_dl/utils.py

index be3f62da702b86376c65f17a45c1e16545a83af2..52f0dd09aac2ef0103212086a280fc317b36b82d 100644 (file)
@@ -730,7 +730,8 @@ def unified_strdate(date_str, day_first=True):
     # Replace commas
     date_str = date_str.replace(',', ' ')
     # %z (UTC offset) is only supported in python>=3.2
-    date_str = re.sub(r' ?(\+|-)[0-9]{2}:?[0-9]{2}$', '', date_str)
+    if not re.match(r'^[0-9]{1,2}-[0-9]{1,2}-[0-9]{4}$', date_str):
+        date_str = re.sub(r' ?(\+|-)[0-9]{2}:?[0-9]{2}$', '', date_str)
     # Remove AM/PM + timezone
     date_str = re.sub(r'(?i)\s*(?:AM|PM)(?:\s+[A-Z]+)?', '', date_str)