X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Futils.py;h=70f28414981111d63fb74c00f3ea554702042ea7;hb=9d11a41fe4f1f70682640e8522565827047dbf89;hp=73fe1ad0a3a27165d3dffc61927733beb9c5ed33;hpb=d70ad093af56330d19eabe54483cbbd44b1bf6c1;p=youtube-dl diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 73fe1ad0a..70f284149 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -1092,9 +1092,12 @@ def month_by_name(name): return None -def fix_xml_all_ampersand(xml_str): +def fix_xml_ampersands(xml_str): """Replace all the '&' by '&' in XML""" - return xml_str.replace(u'&', u'&') + return re.sub( + r'&(?!amp;|lt;|gt;|apos;|quot;|#x[0-9a-fA-F]{,4};|#[0-9]{,4};)', + u'&', + xml_str) def setproctitle(title):