diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-11-20 06:21:05 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-11-20 06:21:05 +0100 |
| commit | 86bd5f2ca9e17bb7f619595e02b28ca4954aeee8 (patch) | |
| tree | e4f506c2ce848e4375361f461030d31b08415895 | |
| parent | 8694c60000d2aed2b37e10da0ffda132249ff10a (diff) | |
| parent | 08bc37cdd02bc861a0b5271abb34623f0ebcd66c (diff) | |
| download | youtube-dl-86bd5f2ca9e17bb7f619595e02b28ca4954aeee8.tar.xz | |
Merge remote-tracking branch 'dz0ny/patch-1'
| -rw-r--r-- | test/test_write_info_json.py | 2 | ||||
| -rw-r--r-- | youtube_dl/YoutubeDL.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/test_write_info_json.py b/test/test_write_info_json.py index a5b6f6972..30c4859fd 100644 --- a/test/test_write_info_json.py +++ b/test/test_write_info_json.py @@ -31,7 +31,7 @@ params = get_params({ TEST_ID = 'BaW_jenozKc' -INFO_JSON_FILE = TEST_ID + '.mp4.info.json' +INFO_JSON_FILE = TEST_ID + '.info.json' DESCRIPTION_FILE = TEST_ID + '.mp4.description' EXPECTED_DESCRIPTION = u'''test chars: "'/\ä↭𝕐 diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index bd093add8..a2e3df1f9 100644 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -717,7 +717,7 @@ class YoutubeDL(object): return if self.params.get('writeinfojson', False): - infofn = filename + u'.info.json' + infofn = os.path.splitext(filename)[0] + u'.info.json' self.report_writeinfojson(infofn) try: json_info_dict = dict((k, v) for k, v in info_dict.items() if not k in ['urlhandle']) |