From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Wed, 16 Nov 2016 15:29:37 +0000 (+0800)
Subject: Merge pull request #11210 from FooBarQuaxx/patch-2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=315cb86a95d6e5c67fef27a88d96477786072b93;hp=d76767c90ec8d0edfabfaf51b7ab28182196d9dd;p=youtube-dl

Merge pull request #11210 from FooBarQuaxx/patch-2

Strip only args urls
---

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 643393558..af99cf1c0 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -95,8 +95,7 @@ def _real_main(argv=None):
                 write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n')
         except IOError:
             sys.exit('ERROR: batch file could not be read')
-    all_urls = batch_urls + args
-    all_urls = [url.strip() for url in all_urls]
+    all_urls = batch_urls + [url.strip() for url in args]  # batch_urls are already striped in read_batch_urls
     _enc = preferredencoding()
     all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls]