Browse Source

Adding proxy to update procedure

David Ben Zakai 9 years ago
parent
commit
d3d3e2e3aa
3 changed files with 6 additions and 6 deletions
  1. 3 0
      youtube_dl/YoutubeDL.py
  2. 1 1
      youtube_dl/__init__.py
  3. 2 5
      youtube_dl/update.py

+ 3 - 0
youtube_dl/YoutubeDL.py

@@ -1994,6 +1994,9 @@ class YoutubeDL(object):
             encoding = preferredencoding()
             encoding = preferredencoding()
         return encoding
         return encoding
 
 
+    def get_opener(self):
+        return self._opener
+
     def _write_thumbnails(self, info_dict, filename):
     def _write_thumbnails(self, info_dict, filename):
         if self.params.get('writethumbnail', False):
         if self.params.get('writethumbnail', False):
             thumbnails = info_dict.get('thumbnails')
             thumbnails = info_dict.get('thumbnails')

+ 1 - 1
youtube_dl/__init__.py

@@ -377,7 +377,7 @@ def _real_main(argv=None):
     with YoutubeDL(ydl_opts) as ydl:
     with YoutubeDL(ydl_opts) as ydl:
         # Update version
         # Update version
         if opts.update_self:
         if opts.update_self:
-            update_self(ydl.to_screen, opts.verbose)
+            update_self(ydl.to_screen, opts.verbose, ydl.get_opener())
 
 
         # Remove cache dir
         # Remove cache dir
         if opts.rm_cachedir:
         if opts.rm_cachedir:

+ 2 - 5
youtube_dl/update.py

@@ -13,7 +13,7 @@ from .compat import (
     compat_str,
     compat_str,
     compat_urllib_request,
     compat_urllib_request,
 )
 )
-from .utils import make_HTTPS_handler
+
 from .version import __version__
 from .version import __version__
 
 
 
 
@@ -47,7 +47,7 @@ def rsa_verify(message, signature, key):
     return True
     return True
 
 
 
 
-def update_self(to_screen, verbose):
+def update_self(to_screen, verbose, opener):
     """Update the program file with the latest version from the repository"""
     """Update the program file with the latest version from the repository"""
 
 
     UPDATE_URL = "https://rg3.github.io/youtube-dl/update/"
     UPDATE_URL = "https://rg3.github.io/youtube-dl/update/"
@@ -59,9 +59,6 @@ def update_self(to_screen, verbose):
         to_screen('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
         to_screen('It looks like you installed youtube-dl with a package manager, pip, setup.py or a tarball. Please use that to update.')
         return
         return
 
 
-    https_handler = make_HTTPS_handler({})
-    opener = compat_urllib_request.build_opener(https_handler)
-
     # Check if there is a new version
     # Check if there is a new version
     try:
     try:
         newversion = opener.open(VERSION_URL).read().decode('utf-8').strip()
         newversion = opener.open(VERSION_URL).read().decode('utf-8').strip()