diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-11-27 17:15:33 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-11-27 17:15:33 +0100 |
| commit | dffe658bac71531dc6aa72088c4d98f6a556bfbf (patch) | |
| tree | 910753b3261883902e69f7e7ca896b778235a58f | |
| parent | 33d94a6c999ae784be7529aaaea42adadeab0c27 (diff) | |
| download | youtube-dl-dffe658bac71531dc6aa72088c4d98f6a556bfbf.tar.xz | |
Remove exclamation mark in --restrict-filenames mode
| -rw-r--r-- | test/test_utils.py | 2 | ||||
| -rw-r--r-- | youtube_dl/utils.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/test_utils.py b/test/test_utils.py index e7d4e0330..a3a23fbb4 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -56,7 +56,7 @@ class TestUtil(unittest.TestCase): 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' + forbidden = u'"\0\\/&!: \'\t\n' for fc in forbidden: for fbc in forbidden: self.assertTrue(fbc not in sanitize_filename(fc, restricted=True)) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 4ace22c2f..a0c41081a 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -208,7 +208,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 '_' @@ -316,7 +316,7 @@ class ContentTooShortError(Exception): class Trouble(Exception): """Trouble helper exception - + This is an exception to be handled with FileDownloader.trouble """ |