Archives/youtube-dl
2
0
Fork 0
mirror of https://source.netsyms.com/Mirrors/youtube-dl synced 2024-11-03 03:40:20 +00:00
Code Issues Projects Releases Wiki Activity

[utils] Fix "write_json_file" for unicode names in python 2.x (fixes #4125)

Browse Source
This commit is contained in:
Jaime Marquínez Ferrándiz 2014-11-15 22:00:32 +01:00
parent 8caa0c9779
commit ec5f601670
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
youtube_dl/utils.py
View File

@ -73,10 +73,22 @@ def preferredencoding():
def write_json_file(obj, fn):
""" Encode obj as JSON and write it to fn, atomically """
if sys.version_info < (3, 0):
encoding = get_filesystem_encoding()
# os.path.basename returns a bytes object, but NamedTemporaryFile
# will fail if the filename contains non ascii characters unless we
# use a unicode object
path_basename = lambda f: os.path.basename(fn).decode(encoding)
# the same for os.path.dirname
path_dirname = lambda f: os.path.dirname(fn).decode(encoding)
else:
path_basename = os.path.basename
path_dirname = os.path.dirname
args = {
'suffix': '.tmp',
'prefix': os.path.basename(fn) + '.',
'dir': os.path.dirname(fn),
'prefix': path_basename(fn) + '.',
'dir': path_dirname(fn),
'delete': False,
}