From b5849698c0b02ef4f441740ed09c920778ab12e3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 16 Dec 2014 09:30:01 +0530 Subject: [PATCH] Use a functionality check on the SSL module instead of checking version numbers, since there are distros out there that backport patches without changing version numbers --- setup/linux-installer.py | 2 +- src/calibre/utils/https.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/linux-installer.py b/setup/linux-installer.py index 7d1c79eda3..4b4a74c55a 100644 --- a/setup/linux-installer.py +++ b/setup/linux-installer.py @@ -19,7 +19,7 @@ py3 = sys.version_info[0] > 2 enc = getattr(sys.stdout, 'encoding', 'UTF-8') or 'utf-8' calibre_version = signature = None urllib = __import__('urllib.request' if py3 else 'urllib', fromlist=1) -has_ssl_verify = sys.version_info[:3] >= (2, 7, 9) +has_ssl_verify = hasattr(ssl, 'PROTOCOL_TLSv1_2') if py3: unicode = str diff --git a/src/calibre/utils/https.py b/src/calibre/utils/https.py index 462440d1d6..b652ad1158 100644 --- a/src/calibre/utils/https.py +++ b/src/calibre/utils/https.py @@ -6,12 +6,12 @@ from __future__ import (unicode_literals, division, absolute_import, __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal ' -import ssl, socket, re, sys +import ssl, socket, re from contextlib import closing from calibre import get_proxies from calibre.constants import ispy3 -has_ssl_verify = sys.version_info[:3] >= (2, 7, 9) +has_ssl_verify = hasattr(ssl, 'PROTOCOL_TLSv1_2') class HTTPError(ValueError):