From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 7 Mar 2015 21:18:16 +0000 (+0100)
Subject: Revert "[YoutubeDL] Sanitize outtmpl as it may contain forbidden characters"
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ab205b9dc8dcee37786dac597f2c3760c89b191c;p=youtube-dl

Revert "[YoutubeDL] Sanitize outtmpl as it may contain forbidden characters"

This reverts commit 7dcad95d4faa91adfaa4d87d411c4bc55ab000e4.

The output template is most definitly allowed to contain forbidden characters; otherwise -o /foo/bar/vid.mp4 wouldn't work.
---

diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py
index bae52e9c7..df2aebb59 100755
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@ -553,20 +553,16 @@ class YoutubeDL(object):
                 elif template_dict.get('width'):
                     template_dict['resolution'] = '?x%d' % template_dict['width']
 
-            restrict_filenames = self.params.get('restrictfilenames')
-
             sanitize = lambda k, v: sanitize_filename(
                 compat_str(v),
-                restricted=restrict_filenames,
+                restricted=self.params.get('restrictfilenames'),
                 is_id=(k == 'id'))
             template_dict = dict((k, sanitize(k, v))
                                  for k, v in template_dict.items()
                                  if v is not None)
             template_dict = collections.defaultdict(lambda: 'NA', template_dict)
 
-            outtmpl = sanitize_filename(
-                self.params.get('outtmpl', DEFAULT_OUTTMPL),
-                restricted=restrict_filenames)
+            outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL)
             tmpl = compat_expanduser(outtmpl)
             filename = tmpl % template_dict
             # Temporary fix for #4787