Merge remote-tracking branch 'rbrito/swap-dimensions'

[youtube-dl] / youtube_dl / extractor / facebook.py

diff --git a/youtube_dl/extractor/facebook.py b/youtube_dl/extractor/facebook.py
index aa2525f175600e86434a789d2cf58a49c1362ed4..3b210710e3695ec3aa940b335d9868a281d7740a 100644 (file)
--- a/youtube_dl/extractor/facebook.py
+++ b/youtube_dl/extractor/facebook.py
@@ -1,5 +1,4 @@
 import json
-import netrc
 import re
 import socket
 
@@ -102,10 +101,11 @@ class FacebookIE(InfoExtractor):
         if not m:
             m_msg = re.search(r'class="[^"]*uiInterstitialContent[^"]*"><div>(.*?)</div>', webpage)
             if m_msg is not None:
-                err_msg = u'The video is not available, Facebook said: "%s"' % m_msg.group(1)
+                raise ExtractorError(
+                    u'The video is not available, Facebook said: "%s"' % m_msg.group(1),
+                    expected=True)
             else:
-                err_msg = u'Cannot parse data'
-            raise ExtractorError(err_msg)
+                raise ExtractorError(u'Cannot parse data')
         data = dict(json.loads(m.group(1)))
         params_raw = compat_urllib_parse.unquote(data['params'])
         params = json.loads(params_raw)