Merge remote-tracking branch 'origin/master' into fork_master

New tests - merged with md5 correction

4 files changed, 12 insertions, 4 deletions

diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index a135be352..48c8eb126 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -463,7 +463,7 @@ class FileDownloader(object):
                 try:
                     success = self._do_download(filename, info_dict)
                 except (OSError, IOError) as err:
-                    raise UnavailableVideoError
+                    raise UnavailableVideoError()
                 except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
                     self.trouble(u'ERROR: unable to download video data: %s' % str(err))
                     return
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index bf0ce14ec..37d6f8cfd 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -423,7 +423,7 @@ def _real_main():
 
     if opts.list_extractors:
         for ie in extractors:
-            print(ie.IE_NAME)
+            print(ie.IE_NAME + (' (CURRENTLY BROKEN)' if not ie._WORKING else ''))
             matchedUrls = filter(lambda url: ie.suitable(url), all_urls)
             all_urls = filter(lambda url: url not in matchedUrls, all_urls)
             for mu in matchedUrls:
diff --git a/youtube_dl/__main__.py b/youtube_dl/__main__.py
index ccc782bec..0910e9d15 100755
--- a/youtube_dl/__main__.py
+++ b/youtube_dl/__main__.py
@@ -1,6 +1,14 @@
 #!/usr/bin/env python
 
-# Execute with python -m youtube_dl
+# Execute with
+# $ python youtube_dl/__main__.py (2.6+)
+# $ python -m youtube_dl          (2.7+)
+
+import sys
+
+if __package__ is None:
+    import os.path
+    sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import youtube_dl
 
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 4600dc967..7f73b8476 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -330,7 +330,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 '_'