youtube-dl

commit 627dcfff398b00429c8b310f1c1775f9be6f0268
parent 799c0763845dfb82d53ecae0080b276f447144de
Author: Philipp Hagemeister <phihag@phihag.de>
Date:   Wed, 28 Nov 2012 12:59:27 +0100

Restrict more characters (Closes #566)

Diffstat:
M
test/test_utils.py
 | 
13
+++++++------
M
youtube_dl/utils.py
 | 
2
+-

2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/test/test_utils.py b/test/test_utils.py
@@ -13,11 +13,12 @@ from youtube_dl.utils import sanitize_filename
 from youtube_dl.utils import unescapeHTML
 from youtube_dl.utils import orderedSet
 
-if sys.version_info < (3,0):
+if sys.version_info < (3, 0):
     _compat_str = lambda b: b.decode('unicode-escape')
 else:
     _compat_str = lambda s: s
 
+
 class TestUtil(unittest.TestCase):
     def test_timeconvert(self):
         self.assertTrue(timeconvert('') is None)
@@ -62,11 +63,11 @@ class TestUtil(unittest.TestCase):
         self.assertEqual('yes_no', sanitize_filename('yes? no', restricted=True))
         self.assertEqual('this_-_that', sanitize_filename('this: that', restricted=True))
 
-        tests =_compat_str('a\xe4b\u4e2d\u56fd\u7684c')
+        tests = _compat_str('a\xe4b\u4e2d\u56fd\u7684c')
         self.assertEqual(sanitize_filename(tests, restricted=True), 'a_b_c')
-        self.assertTrue(sanitize_filename(_compat_str('\xf6'), restricted=True) != '') # No empty filename
+        self.assertTrue(sanitize_filename(_compat_str('\xf6'), restricted=True) != '')  # No empty filename
 
-        forbidden = '"\0\\/&!: \'\t\n'
+        forbidden = '"\0\\/&!: \'\t\n()[]{}$;`^,#'
         for fc in forbidden:
             for fbc in forbidden:
                 self.assertTrue(fbc not in sanitize_filename(fc, restricted=True))
@@ -79,11 +80,11 @@ class TestUtil(unittest.TestCase):
         self.assertTrue(sanitize_filename(':', restricted=True) != '')
 
     def test_ordered_set(self):
-        self.assertEqual(orderedSet([1,1,2,3,4,4,5,6,7,3,5]), [1,2,3,4,5,6,7])
+        self.assertEqual(orderedSet([1, 1, 2, 3, 4, 4, 5, 6, 7, 3, 5]), [1, 2, 3, 4, 5, 6, 7])
         self.assertEqual(orderedSet([]), [])
         self.assertEqual(orderedSet([1]), [1])
         #keep the list ordered
-        self.assertEqual(orderedSet([135,1,1,1]), [135,1])
+        self.assertEqual(orderedSet([135, 1, 1, 1]), [135, 1])
 
     def test_unescape_html(self):
         self.assertEqual(unescapeHTML(_compat_str('%20;')), _compat_str('%20;'))
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
@@ -330,7 +330,7 @@ def sanitize_filename(s, restricted=False):
             return '_-' if restricted else ' -'
         elif char in '\\/|*<>':
             return '_'
-        if restricted and (char in '!&\'' or char.isspace()):
+        if restricted and (char in '!&\'()[]{}$;`^,#' or char.isspace()):
             return '_'
         if restricted and ord(char) > 127:
             return '_'