瀏覽代碼

[pbs] Improve geo restriction detection and use geo bypass mechanism

Sergey M․ 8 年之前
父節點
當前提交
8ab8066cf0
共有 1 個文件被更改,包括 5 次插入4 次删除
  1. 5 4
      youtube_dl/extractor/pbs.py

+ 5 - 4
youtube_dl/extractor/pbs.py

@@ -489,11 +489,12 @@ class PBSIE(InfoExtractor):
                 headers=self.geo_verification_headers())
 
             if redirect_info['status'] == 'error':
+                message = self._ERRORS.get(
+                    redirect_info['http_code'], redirect_info['message'])
+                if redirect_info['http_code'] == 403:
+                    self.raise_geo_restricted(msg=message, countries=['US'])
                 raise ExtractorError(
-                    '%s said: %s' % (
-                        self.IE_NAME,
-                        self._ERRORS.get(redirect_info['http_code'], redirect_info['message'])),
-                    expected=True)
+                    '%s said: %s' % (self.IE_NAME, message), expected=True)
 
             format_url = redirect_info.get('url')
             if not format_url: