diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-07-03 23:23:48 +0800 | 
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-07-03 23:29:56 +0800 | 
| commit | 38cce791c71e9da33854e56114233d60345e18c0 (patch) | |
| tree | 51eb94d8b539d4646a66c347bf0b3f2651b2cf80 /youtube_dl/YoutubeDL.py | |
| parent | bf3ae6a543ee8825308e8427f60fceb125a77ab5 (diff) | |
Rename --cn-verfication-proxy to --geo-verification-proxy
And deprecate the former one
Since commit f1388739002a7fd1e8e9c41b642734786fc6c391, this option is
not limited to China websites, so rename it.
Diffstat (limited to 'youtube_dl/YoutubeDL.py')
| -rwxr-xr-x | youtube_dl/YoutubeDL.py | 9 | 
1 files changed, 7 insertions, 2 deletions
diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 5036289b0..ba72ec6f3 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -196,8 +196,8 @@ class YoutubeDL(object):      prefer_insecure:   Use HTTP instead of HTTPS to retrieve information.                         At the moment, this is only supported by YouTube.      proxy:             URL of the proxy server to use -    cn_verification_proxy:  URL of the proxy to use for IP address verification -                       on Chinese sites. (Experimental) +    geo_verification_proxy:  URL of the proxy to use for IP address verification +                       on geo-restricted sites. (Experimental)      socket_timeout:    Time to wait for unresponsive hosts, in seconds      bidi_workaround:   Work around buggy terminals without bidirectional text                         support, using fridibi @@ -304,6 +304,11 @@ class YoutubeDL(object):          self.params.update(params)          self.cache = Cache(self) +        if self.params.get('cn_verification_proxy') is not None: +            self.report_warning('--cn-verification-proxy is deprecated. Use --geo-verification-proxy instead.') +            if self.params.get('geo_verification_proxy') is None: +                self.params['geo_verification_proxy'] = self.params['cn_verification_proxy'] +          if params.get('bidi_workaround', False):              try:                  import pty  | 
