Merge remote-tracking branch 'dz0ny/patch-1'

This commit is contained in:
Philipp Hagemeister 2013-11-20 06:21:05 +01:00
commit 86bd5f2ca9
2 changed files with 2 additions and 2 deletions

View file

@ -31,7 +31,7 @@ def __init__(self, *args, **kwargs):
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: "'/\ä↭𝕐

View file

@ -717,7 +717,7 @@ def process_info(self, info_dict):
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'])