Fix #2355 (date parsing with dashes)

diff --git a/test/test_utils.py b/test/test_utils.py
index c68e0e96844213f6626c950bd89487b74223593e..97c408ebf76c3028223d6e0f359e55f7b8f6b2e4 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -127,6 +127,7 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(unified_strdate('8/7/2009'), '20090708')
         self.assertEqual(unified_strdate('Dec 14, 2012'), '20121214')
         self.assertEqual(unified_strdate('2012/10/11 01:56:38 +0000'), '20121011')
+        self.assertEqual(unified_strdate('1968-12-10'), '19681210')
 
     def test_find_xpath_attr(self):
         testxml = u'''<root>

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index fa8f80e024c40f4c2676a86971b790ee47484973..67c6af5070bbe214221b288649049913bfccadf5 100644 (file)
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -756,9 +756,9 @@ def unified_strdate(date_str):
     """Return a string with the date in the format YYYYMMDD"""
     upload_date = None
     #Replace commas
-    date_str = date_str.replace(',',' ')
+    date_str = date_str.replace(',', ' ')
     # %z (UTC offset) is only supported in python>=3.2
-    date_str = re.sub(r' ?(\+|-)[0-9:]*$', '', date_str)
+    date_str = re.sub(r' ?(\+|-)[0-9]{2}:?[0-9]{2}$', '', date_str)
     format_expressions = [
         '%d %B %Y',
         '%B %d %Y',