From fe2812ec9cdd14c822d914bf2f3a95b0f95756d9 Mon Sep 17 00:00:00 2001 From: Koki Takahashi Date: Sat, 31 Oct 2015 20:28:10 +0900 Subject: [PATCH] Remove trailing spaces on sanitizing filename --- youtube_dl/utils.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 558c9c7d5..4117b3f88 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -330,6 +330,10 @@ def sanitize_filename(s, restricted=False, is_id=False): # Handle timestamps s = re.sub(r'[0-9]+(?::[0-9]+)+', lambda m: m.group(0).replace(':', '_'), s) result = ''.join(map(replace_insane, s)) + + # Remove trailing spaces. os.mkdir fails to create directory ending with spaces on Windows. + result = result.rstrip() + if not is_id: while '__' in result: result = result.replace('__', '_')