From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 4 Feb 2017 11:52:20 +0000 (+0700)
Subject: [pbs] Improve geo restriction detection and use geo bypass mechanism
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=8ab8066cf08352ad336c3ff594d0ac27f6c809c8;p=youtube-dl

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

diff --git a/youtube_dl/extractor/pbs.py b/youtube_dl/extractor/pbs.py
index 6baed773f..64f47bae3 100644
--- a/youtube_dl/extractor/pbs.py
+++ b/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: