diff options
author | Sergey M․ <dstftw@gmail.com> | 2014-08-21 22:03:00 +0700 |
---|---|---|
committer | Sergey M․ <dstftw@gmail.com> | 2014-08-21 22:03:00 +0700 |
commit | 73159f99cc3be44b207154ecd56d16750cade77a (patch) | |
tree | 957a9262c50d625d7a65c9b2fcf07e6b5f2a3c6c | |
parent | 55db73efdf1860bbd24b8556fbefd2ba6263a2cf (diff) |
[utils] Add missing mode and encoding arguments
-rw-r--r-- | youtube_dl/utils.py | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index d11e46c80..f8ec5389f 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -233,18 +233,24 @@ else: def write_json_file(obj, fn): """ Encode obj as JSON and write it to fn, atomically """ + args = { + 'suffix': '.tmp', + 'prefix': os.path.basename(fn) + '.', + 'dir': os.path.dirname(fn), + 'delete': False, + } + # In Python 2.x, json.dump expects a bytestream. # In Python 3.x, it writes to a character stream if sys.version_info < (3, 0): - mode = 'wb' - encoding = None + args['mode'] = 'wb' else: - mode = 'w' - encoding = 'utf-8' - tf = tempfile.NamedTemporaryFile( - suffix='.tmp', prefix=os.path.basename(fn) + '.', - dir=os.path.dirname(fn), - delete=False) + args.update({ + 'mode': 'w', + 'encoding': 'utf-8', + }) + + tf = tempfile.NamedTemporaryFile(**args) try: with tf: |