X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fpostprocessor%2Fxattrpp.py;h=18979241cd9f0bb70cf2d8e9c00709ec43db1fea;hb=685052fc7b8e7c70fc524098e45f0c1052c5eaec;hp=1cb8ecf1c89ce8b42b5dab16551ac9418a747b82;hpb=168da92b9a1509d11fdbe505109b8eff77819602;p=youtube-dl diff --git a/youtube_dl/postprocessor/xattrpp.py b/youtube_dl/postprocessor/xattrpp.py index 1cb8ecf1c..18979241c 100644 --- a/youtube_dl/postprocessor/xattrpp.py +++ b/youtube_dl/postprocessor/xattrpp.py @@ -6,7 +6,6 @@ from .common import PostProcessor from ..utils import ( check_executable, hyphenate_date, - preferredencoding, ) @@ -40,12 +39,11 @@ class XAttrMetadataPP(PostProcessor): # Write xattrs to NTFS Alternate Data Streams: # http://en.wikipedia.org/wiki/NTFS#Alternate_data_streams_.28ADS.29 def write_xattr(path, key, value): - assert(key.find(":") < 0) - assert(path.find(":") < 0) - assert(os.path.exists(path)) + assert ':' not in key + assert os.path.exists(path) ads_fn = path + ":" + key - with open(ads_fn, "w") as f: + with open(ads_fn, "wb") as f: f.write(value) else: user_has_setfattr = check_executable("setfattr", ['--version']) @@ -99,7 +97,7 @@ class XAttrMetadataPP(PostProcessor): if infoname == "upload_date": value = hyphenate_date(value) - byte_value = value.encode(preferredencoding()) + byte_value = value.encode('utf-8') write_xattr(filename, xattrname, byte_value) return True, info