Ok, the Escapist test was passing only in my Travis repo, do not ask me why; also...

diff --git a/test/tests.json b/test/tests.json
index 982e0ad3b5c5ea0ca0170dd2d348bd8c054ec2a3..c2de6099d20b903c7d0153e07c2be1a870ad2541 100644 (file)
--- a/test/tests.json
+++ b/test/tests.json
@@ -95,7 +95,8 @@
     "name": "Escapist",
     "url": "http://www.escapistmagazine.com/videos/view/the-escapist-presents/6618-Breaking-Down-Baldurs-Gate",
     "file": "6618-Breaking-Down-Baldurs-Gate.flv",
-    "md5": "c6793dbda81388f4264c1ba18684a74d"
+    "md5": "c6793dbda81388f4264c1ba18684a74d",
+    "skip": "Fails with timeout on Travis"
   },
   {
     "name": "GooglePlus",

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 53c68237b8ba5d44b9c612099e84ffa0654852b8..ebc2552dfc0933306a2e50b1e4a9b0bc8e501270 100644 (file)
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -494,7 +494,7 @@ class FileDownloader(object):
                 # Extract information from URL and process it
                 videos = ie.extract(url)
 
-                if len(videos) > 1 and self.fixed_template():
+                if len(videos or []) > 1 and self.fixed_template():
                     raise SameFileError(self.params['outtmpl'])
 
                 for video in videos or []: