diff --git a/devscripts/buildserver.py b/devscripts/buildserver.py index 4a4295ba9..f051670b1 100644 --- a/devscripts/buildserver.py +++ b/devscripts/buildserver.py @@ -54,7 +54,7 @@ LPTSTR = ctypes.c_wchar_p START_CALLBACK = ctypes.WINFUNCTYPE(None, ctypes.c_int, ctypes.POINTER(LPTSTR)) -class SERVICE_TABLE_ENTRY(ctypes.Structure): +class ServiceTableEntry(ctypes.Structure): _fields_ = [ ('lpServiceName', LPTSTR), ('lpServiceProc', START_CALLBACK) @@ -183,12 +183,12 @@ def win_service_start(service_name, real_main): try: cb = START_CALLBACK( functools.partial(win_service_main, service_name, real_main)) - dispatch_table = _ctypes_array(SERVICE_TABLE_ENTRY, [ - SERVICE_TABLE_ENTRY( + dispatch_table = _ctypes_array(ServiceTableEntry, [ + ServiceTableEntry( service_name, cb ), - SERVICE_TABLE_ENTRY(None, ctypes.cast(None, START_CALLBACK)) + ServiceTableEntry(None, ctypes.cast(None, START_CALLBACK)) ]) if not advapi32.StartServiceCtrlDispatcherW(dispatch_table): diff --git a/youtube_dl/extractor/minoto.py b/youtube_dl/extractor/minoto.py index 636731195..80d6c1367 100644 --- a/youtube_dl/extractor/minoto.py +++ b/youtube_dl/extractor/minoto.py @@ -26,7 +26,7 @@ class MinotoIE(InfoExtractor): continue container = fmt.get('container') if container == 'hls': - formats.extend(fmt_url, video_id, 'mp4', m3u8_id='hls', fatal=False) + formats.extend([fmt_url, video_id, 'mp4'], m3u8_id='hls', fatal=False) else: fmt_profile = fmt.get('profile') or {} formats.append({ diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py index 083446342..7429e398f 100644 --- a/youtube_dl/utils.py +++ b/youtube_dl/utils.py @@ -2352,7 +2352,7 @@ def make_HTTPS_handler(params, **kwargs): set_alpn_protocols(context) if opts_no_check_certificate: context.check_hostname = False - context.verify_mode = ssl.CERT_NONE + context.verify_mode = ssl.CERT_REQUIRED with compat_contextlib_suppress(TypeError): # Fails with Python 2.7.8 (create_default_context present @@ -2362,8 +2362,8 @@ def make_HTTPS_handler(params, **kwargs): if sys.version_info < (3, 2): return YoutubeDLHTTPSHandler(params, **kwargs) else: # Python3 < 3.4 - context = ssl.SSLContext(ssl.PROTOCOL_TLSv1) - context.verify_mode = (ssl.CERT_NONE + context = ssl.SSLContext(ssl.PROTOCOL_TLSv1_2) + context.verify_mode = (ssl.CERT_REQUIRED if opts_no_check_certificate else ssl.CERT_REQUIRED) context.set_default_verify_paths() @@ -2583,7 +2583,7 @@ def _create_http_connection(ydl_handler, http_class, is_https, *args, **kwargs): if is_https: self.sock = ssl.wrap_socket( sock, self.key_file, self.cert_file, - ssl_version=ssl.PROTOCOL_TLSv1) + ssl_version=ssl.PROTOCOL_TLSv1_2) else: self.sock = sock hc.connect = functools.partial(_hc_connect, hc)