From: Philipp Hagemeister Date: Fri, 13 Dec 2013 15:41:34 +0000 (-0800) Subject: Merge pull request #1956 from dstftw/master X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=2a203a6cda7171d5417423a43b640c1d5ba7e7e0;hp=-c;p=youtube-dl.git Merge pull request #1956 from dstftw/master Fix typo in month name --- 2a203a6cda7171d5417423a43b640c1d5ba7e7e0 diff --combined youtube_dl/utils.py index 4593488ce,d9bf6c24c..4e8a84a56 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@@ -1051,14 -1051,9 +1051,14 @@@ def month_by_name(name) """ Return the number of a month by (locale-independently) English name """ ENGLISH_NAMES = [ - u'Januar', u'February', u'March', u'April', u'May', u'June', + u'January', u'February', u'March', u'April', u'May', u'June', u'July', u'August', u'September', u'October', u'November', u'December'] try: return ENGLISH_NAMES.index(name) + 1 except ValueError: return None + + +def fix_xml_all_ampersand(xml_str): + """Replace all the '&' by '&' in XML""" + return xml_str.replace(u'&', u'&')