]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[extractor/common] Wrap extractor errors (Fixes #1194)
authorPhilipp Hagemeister <phihag@phihag.de>
Tue, 10 Feb 2015 00:13:57 +0000 (01:13 +0100)
committerPhilipp Hagemeister <phihag@phihag.de>
Tue, 10 Feb 2015 00:17:23 +0000 (01:17 +0100)
For now, we just wrap some common errors. More may follow. We do not want to catch actual programming errors in the extractors, such as 1 // 0.

youtube_dl/extractor/common.py

index 2f5ba7aee37fa7b4f26c6ebc68bc1a5abe31296c..eee936a6f8b54bc0ca924f2f1a6cd2fd9a23c2f9 100644 (file)
@@ -264,8 +264,15 @@ class InfoExtractor(object):
 
     def extract(self, url):
         """Extracts URL information and returns it in list of dicts."""
-        self.initialize()
-        return self._real_extract(url)
+        try:
+            self.initialize()
+            return self._real_extract(url)
+        except ExtractorError:
+            raise
+        except compat_http_client.IncompleteRead as e:
+            raise ExtractorError('A network error has occured.', cause=e, expected=True)
+        except (KeyError,) as e:
+            raise ExtractorError('An extractor error has occured.', cause=e)
 
     def set_downloader(self, downloader):
         """Sets the downloader for this IE."""