diff options
| author | Yen Chi Hsuan <[email protected]> | 2017-04-29 15:58:45 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-29 15:58:45 +0800 |
| commit | d19093bd50a0123b7d00c263b012d6d391814970 (patch) | |
| tree | beeff14a9499d3a31dedd33cb12e35ec99f5bef9 | |
| parent | 24eb7c257807aceef713f6d01824cf600a9d6232 (diff) | |
| parent | 9222d945107411ba657dab965fab63de8e8781b9 (diff) | |
| download | youtube-dl-d19093bd50a0123b7d00c263b012d6d391814970.tar.gz youtube-dl-d19093bd50a0123b7d00c263b012d6d391814970.zip | |
Merge pull request #12906 from Tithen-Firion/clean-html-fix
[utils] Fix inconsistent output of clean_html
| -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 4cd818850..9e1808e6b 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -899,6 +899,7 @@ class TestUtil(unittest.TestCase): def test_clean_html(self): self.assertEqual(clean_html('a:\nb'), 'a: b') self.assertEqual(clean_html('a:\n "b"'), 'a: "b"') + self.assertEqual(clean_html('a<br>\xa0b'), 'a\nb') def test_intlist_to_bytes(self): self.assertEqual( diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 91e235ff2..41bc20544 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -421,8 +421,8 @@ def clean_html(html): # Newline vs <br /> html = html.replace('\n', ' ') - html = re.sub(r'\s*<\s*br\s*/?\s*>\s*', '\n', html) - html = re.sub(r'<\s*/\s*p\s*>\s*<\s*p[^>]*>', '\n', html) + html = re.sub(r'(?u)\s*<\s*br\s*/?\s*>\s*', '\n', html) + html = re.sub(r'(?u)<\s*/\s*p\s*>\s*<\s*p[^>]*>', '\n', html) # Strip html tags html = re.sub('<.*?>', '', html) # Replace html entities |