R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix behavior with unavailable formatters

Browse Source 
Turns out defaultdict and str.format(**d) don't work well together; using string.Formatter().vformat() instead.
My bad.
This commit is contained in:
cousteau 2015-08-14 20:34:02 +02:00
parent e45665c912
commit 08db5463cd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/YoutubeDL.py
View File

@ -17,6 +17,7 @@ import os
import platform import platform
import re import re
import shutil import shutil
import string
import subprocess import subprocess
import socket import socket
import sys import sys
@ -570,7 +571,7 @@ class YoutubeDL(object):
tmpl = compat_expanduser(outtmpl) tmpl = compat_expanduser(outtmpl)
# Backwards compatibility fix (deprecated): %(foo)s -> {foo}, %% -> % # Backwards compatibility fix (deprecated): %(foo)s -> {foo}, %% -> %
tmpl = re.sub(r'(?<!%)((?:%)*)\1%\(([^)]*)\)s', r'\1{\2}', tmpl).replace('%%','%') tmpl = re.sub(r'(?<!%)((?:%)*)\1%\(([^)]*)\)s', r'\1{\2}', tmpl).replace('%%','%')
filename = sanitize_path(tmpl.format(**template_dict)) filename = sanitize_path(string.Formatter().vformat(tmpl, None, template_dict))
# Temporary fix for #4787 # Temporary fix for #4787
# 'Treat' all problem characters by passing filename through preferredencoding # 'Treat' all problem characters by passing filename through preferredencoding
# to workaround encoding issues with subprocess on python2 @ Windows # to workaround encoding issues with subprocess on python2 @ Windows