X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fcompat.py;h=8ab6880011f6084cc1b28d928dec904740c0c6ff;hb=fae45ede082e50a4935e014b47cbfde925c0f8ed;hp=2d43ec852ca2cfa41cf702fb7aac28fbee11bec6;hpb=f78546272cf7c4b10c8003870728ab69bec982fc;p=youtube-dl diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py index 2d43ec852..8ab688001 100644 --- a/youtube_dl/compat.py +++ b/youtube_dl/compat.py @@ -216,8 +216,8 @@ except ImportError: # Python 2.6 if sys.version_info[0] >= 3: compat_etree_fromstring = xml.etree.ElementTree.fromstring else: - # on python 2.x the attributes and text of a node aren't always unicode - # objects + # python 2.x tries to encode unicode strings with ascii (see the + # XMLParser._fixtext method) etree = xml.etree.ElementTree try: @@ -433,7 +433,7 @@ if sys.version_info < (3, 0) and sys.platform == 'win32': else: compat_getpass = getpass.getpass -# Old 2.6 and 2.7 releases require kwargs to be bytes +# Python < 2.6.5 require kwargs to be bytes try: def _testfunc(x): pass