]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[utils] unified_strdate: Return None if the date format can't be recognized (fixes...
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 2 Nov 2015 13:08:38 +0000 (14:08 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Mon, 2 Nov 2015 13:08:38 +0000 (14:08 +0100)
This issue was introduced with ae12bc3ebb4cb377c2b4337ec255e652b36f5143, it returned 'None'.

test/test_utils.py
youtube_dl/utils.py

index 3298315d2458903da67187b2d2bddeccd5e125a7..01829f71e3b89148b06d6b0fe2eba6d15d6b5dfb 100644 (file)
@@ -236,6 +236,7 @@ class TestUtil(unittest.TestCase):
             unified_strdate('2/2/2015 6:47:40 PM', day_first=False),
             '20150202')
         self.assertEqual(unified_strdate('25-09-2014'), '20140925')
+        self.assertEqual(unified_strdate('UNKNOWN DATE FORMAT'), None)
 
     def test_find_xpath_attr(self):
         testxml = '''<root>
index 7b3f79141fff9abb12b7ac2a532592d790a8171c..d39f313a41802f38f91418e12cc89dcd798b0286 100644 (file)
@@ -911,7 +911,8 @@ def unified_strdate(date_str, day_first=True):
         timetuple = email.utils.parsedate_tz(date_str)
         if timetuple:
             upload_date = datetime.datetime(*timetuple[:6]).strftime('%Y%m%d')
-    return compat_str(upload_date)
+    if upload_date is not None:
+        return compat_str(upload_date)
 
 
 def determine_ext(url, default_ext='unknown_video'):