From: Yen Chi Hsuan Date: Fri, 10 Jul 2015 10:43:38 +0000 (+0800) Subject: [neteasemusic] Encoding fixes for Python 2.6 and 3.x X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=397a8ea96e228f918f127313f837f7de7dd78aed;p=youtube-dl [neteasemusic] Encoding fixes for Python 2.6 and 3.x --- diff --git a/youtube_dl/extractor/neteasemusic.py b/youtube_dl/extractor/neteasemusic.py index e73c77f89..9e99ddbda 100644 --- a/youtube_dl/extractor/neteasemusic.py +++ b/youtube_dl/extractor/neteasemusic.py @@ -11,6 +11,7 @@ from .common import InfoExtractor from ..compat import ( compat_urllib_request, compat_urllib_parse, + compat_str, ) @@ -21,14 +22,14 @@ class NetEaseMusicBaseIE(InfoExtractor): @classmethod def _encrypt(cls, dfsid): - salt_bytes = bytearray(cls._NETEASE_SALT, 'utf-8') - string_bytes = bytearray(str(dfsid)) + salt_bytes = bytearray(cls._NETEASE_SALT.encode('utf-8')) + string_bytes = bytearray(compat_str(dfsid).encode('ascii')) salt_len = len(salt_bytes) for i in range(len(string_bytes)): string_bytes[i] = string_bytes[i] ^ salt_bytes[i % salt_len] m = md5() - m.update(string_bytes) - result = b64encode(m.digest()) + m.update(bytes(string_bytes)) + result = b64encode(m.digest()).decode('ascii') return result.replace('/', '_').replace('+', '-') @classmethod