diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-02-09 18:09:57 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-02-09 18:09:57 +0100 |
| commit | 026fcc04956f2077a50cd4b4e9b87f45d2bcddea (patch) | |
| tree | c8793f94bd3ecbe1f3af8192f2f451ee167465b8 | |
| parent | 81c2f20b5386d89a62dc27293654d75b77f47473 (diff) | |
| download | youtube-dl-026fcc04956f2077a50cd4b4e9b87f45d2bcddea.tar.gz youtube-dl-026fcc04956f2077a50cd4b4e9b87f45d2bcddea.tar.xz youtube-dl-026fcc04956f2077a50cd4b4e9b87f45d2bcddea.zip | |
Fix #2355 (date parsing with dashes)
| -rw-r--r-- | test/test_utils.py | 1 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index c68e0e968..97c408ebf 100644 --- 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 fa8f80e02..67c6af507 100644 --- 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', |