Remove exclamation mark in --restrict-filenames mode

[youtube-dl] / test / test_utils.py

diff --git a/test/test_utils.py b/test/test_utils.py
index 0a435ddc547ef28a5aab9444ce466c4ccd75beaa..a3a23fbb4a5a71da86488c951b151c5c42e17456 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -22,10 +22,10 @@ class TestUtil(unittest.TestCase):
 
                self.assertEqual(sanitize_filename(u'123'), u'123')
 
-               self.assertEqual(u'abc-de', sanitize_filename(u'abc/de'))
+               self.assertEqual(u'abc_de', sanitize_filename(u'abc/de'))
                self.assertFalse(u'/' in sanitize_filename(u'abc/de///'))
 
-               self.assertEqual(u'abc-de', sanitize_filename(u'abc/<>\\*|de'))
+               self.assertEqual(u'abc_de', sanitize_filename(u'abc/<>\\*|de'))
                self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|'))
                self.assertEqual(u'yes no', sanitize_filename(u'yes? no'))
                self.assertEqual(u'this - that', sanitize_filename(u'this: that'))
@@ -45,20 +45,29 @@ class TestUtil(unittest.TestCase):
 
                self.assertEqual(sanitize_filename(u'123', restricted=True), u'123')
 
-               self.assertEqual(u'abc-de', sanitize_filename(u'abc/de', restricted=True))
+               self.assertEqual(u'abc_de', sanitize_filename(u'abc/de', restricted=True))
                self.assertFalse(u'/' in sanitize_filename(u'abc/de///', restricted=True))
 
-               self.assertEqual(u'abc-de', sanitize_filename(u'abc/<>\\*|de', restricted=True))
+               self.assertEqual(u'abc_de', sanitize_filename(u'abc/<>\\*|de', restricted=True))
                self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|', restricted=True))
                self.assertEqual(u'yes_no', sanitize_filename(u'yes? no', restricted=True))
                self.assertEqual(u'this_-_that', sanitize_filename(u'this: that', restricted=True))
 
-               forbidden = u'"\0\\/&: \'\t\n'
+               self.assertEqual(sanitize_filename(u'aäb中国的c', restricted=True), u'a_b_c')
+               self.assertTrue(sanitize_filename(u'ö', restricted=True) != u'') # No empty filename
+
+               forbidden = u'"\0\\/&!: \'\t\n'
                for fc in forbidden:
-                       print('input: ' + fc + ', result: ' + repr(sanitize_filename(fc, restricted=True)))
                        for fbc in forbidden:
                                self.assertTrue(fbc not in sanitize_filename(fc, restricted=True))
 
+               # Handle a common case more neatly
+               self.assertEqual(sanitize_filename(u'大声带 - Song', restricted=True), u'Song')
+               self.assertEqual(sanitize_filename(u'总统: Speech', restricted=True), u'Speech')
+               # .. but make sure the file name is never empty
+               self.assertTrue(sanitize_filename(u'-', restricted=True) != u'')
+               self.assertTrue(sanitize_filename(u':', restricted=True) != u'')
+
        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([]), [])