Merge pull request #7436 from davidbz/add_proxy_to_update_procedure
Add proxy support for update_self
This commit is contained in:
		@@ -377,7 +377,7 @@ def _real_main(argv=None):
 | 
			
		||||
    with YoutubeDL(ydl_opts) as ydl:
 | 
			
		||||
        # Update version
 | 
			
		||||
        if opts.update_self:
 | 
			
		||||
            update_self(ydl.to_screen, opts.verbose)
 | 
			
		||||
            update_self(ydl.to_screen, opts.verbose, ydl._opener)
 | 
			
		||||
 | 
			
		||||
        # Remove cache dir
 | 
			
		||||
        if opts.rm_cachedir:
 | 
			
		||||
 
 | 
			
		||||
@@ -9,11 +9,8 @@ import subprocess
 | 
			
		||||
import sys
 | 
			
		||||
from zipimport import zipimporter
 | 
			
		||||
 | 
			
		||||
from .compat import (
 | 
			
		||||
    compat_str,
 | 
			
		||||
    compat_urllib_request,
 | 
			
		||||
)
 | 
			
		||||
from .utils import make_HTTPS_handler
 | 
			
		||||
from .compat import compat_str
 | 
			
		||||
 | 
			
		||||
from .version import __version__
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -47,7 +44,7 @@ def rsa_verify(message, signature, key):
 | 
			
		||||
    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_URL = "https://rg3.github.io/youtube-dl/update/"
 | 
			
		||||
@@ -59,9 +56,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.')
 | 
			
		||||
        return
 | 
			
		||||
 | 
			
		||||
    https_handler = make_HTTPS_handler({})
 | 
			
		||||
    opener = compat_urllib_request.build_opener(https_handler)
 | 
			
		||||
 | 
			
		||||
    # Check if there is a new version
 | 
			
		||||
    try:
 | 
			
		||||
        newversion = opener.open(VERSION_URL).read().decode('utf-8').strip()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user