mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-05 17:12:36 +00:00
Remove some antipatterns and ensure that we always write the JSON file with UTF-8
This commit is contained in:
parent
80d3177e5c
commit
ce4be3a91d
@ -4,6 +4,7 @@
|
||||
from __future__ import absolute_import
|
||||
|
||||
import math
|
||||
import io
|
||||
import os
|
||||
import re
|
||||
import socket
|
||||
@ -453,12 +454,9 @@ class FileDownloader(object):
|
||||
self.trouble(u'ERROR: No JSON encoder found. Update to Python 2.6+, setup a json module, or leave out --write-info-json.')
|
||||
return
|
||||
try:
|
||||
infof = open(encodeFilename(infofn), 'w')
|
||||
try:
|
||||
json_info_dict = dict((k, info_dict[k]) for k in info_dict if not k in ['urlhandle'])
|
||||
with io.open(encodeFilename(infofn), 'w', 'utf-8') as infof:
|
||||
json_info_dict = dict((k, v) for k,v in info_dict.items() if not k in ['urlhandle'])
|
||||
json.dump(json_info_dict, infof)
|
||||
finally:
|
||||
infof.close()
|
||||
except (OSError, IOError):
|
||||
self.trouble(u'ERROR: Cannot write metadata to JSON file ' + infofn)
|
||||
return
|
||||
|
Loading…
Reference in New Issue
Block a user