From 9ec8ed70a3bbbecc43e6c27714042e2abe9a3fc0 Mon Sep 17 00:00:00 2001 From: Ayrx Date: Thu, 6 Mar 2014 17:54:45 +0800 Subject: Added check to turn of CC backend for OS X version < 10.8 --- cryptography/hazmat/bindings/commoncrypto/binding.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cryptography/hazmat/bindings/commoncrypto/binding.py b/cryptography/hazmat/bindings/commoncrypto/binding.py index 45c0eaad..07d9cc6d 100644 --- a/cryptography/hazmat/bindings/commoncrypto/binding.py +++ b/cryptography/hazmat/bindings/commoncrypto/binding.py @@ -14,6 +14,9 @@ from __future__ import absolute_import, division, print_function import sys +import platform + +from pkg_resources import parse_version from cryptography.hazmat.bindings.utils import build_ffi @@ -46,4 +49,13 @@ class Binding(object): @classmethod def is_available(cls): - return sys.platform == "darwin" + if sys.platform == "darwin": + version = parse_version(platform.mac_ver()[0]) + if version < parse_version("10.8"): + return False + + else: + return True + + else: + return False -- cgit v1.2.3 From e4880e6768cf7c2635734a2082ab62d3a416d3ce Mon Sep 17 00:00:00 2001 From: Ayrx Date: Thu, 6 Mar 2014 20:59:04 +0800 Subject: Fix drop in coverage levels by removing branches --- cryptography/hazmat/bindings/commoncrypto/binding.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/cryptography/hazmat/bindings/commoncrypto/binding.py b/cryptography/hazmat/bindings/commoncrypto/binding.py index 07d9cc6d..e14b8ca3 100644 --- a/cryptography/hazmat/bindings/commoncrypto/binding.py +++ b/cryptography/hazmat/bindings/commoncrypto/binding.py @@ -13,7 +13,6 @@ from __future__ import absolute_import, division, print_function -import sys import platform from pkg_resources import parse_version @@ -49,13 +48,5 @@ class Binding(object): @classmethod def is_available(cls): - if sys.platform == "darwin": - version = parse_version(platform.mac_ver()[0]) - if version < parse_version("10.8"): - return False - - else: - return True - - else: - return False + version = parse_version(platform.mac_ver()[0]) + return version >= parse_version("10.8") -- cgit v1.2.3 From 4dd97e5fd80753a7bf023e63ef209fa8fb16025a Mon Sep 17 00:00:00 2001 From: Ayrx Date: Sat, 8 Mar 2014 15:26:42 +0800 Subject: Removed dependency on setuptools for version check --- cryptography/hazmat/bindings/commoncrypto/binding.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cryptography/hazmat/bindings/commoncrypto/binding.py b/cryptography/hazmat/bindings/commoncrypto/binding.py index e14b8ca3..f10e9bd0 100644 --- a/cryptography/hazmat/bindings/commoncrypto/binding.py +++ b/cryptography/hazmat/bindings/commoncrypto/binding.py @@ -13,10 +13,9 @@ from __future__ import absolute_import, division, print_function +import sys import platform -from pkg_resources import parse_version - from cryptography.hazmat.bindings.utils import build_ffi @@ -48,5 +47,5 @@ class Binding(object): @classmethod def is_available(cls): - version = parse_version(platform.mac_ver()[0]) - return version >= parse_version("10.8") + return sys.platform == "darwin" and map( + int, platform.mac_ver()[0].split(".")) >= [10, 8, 0] -- cgit v1.2.3 From 3558fd0360c96887389cc17ac617d53d62ac43ab Mon Sep 17 00:00:00 2001 From: Ayrx Date: Sat, 8 Mar 2014 15:53:43 +0800 Subject: Fixed python3 incompatibility --- cryptography/hazmat/bindings/commoncrypto/binding.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cryptography/hazmat/bindings/commoncrypto/binding.py b/cryptography/hazmat/bindings/commoncrypto/binding.py index f10e9bd0..ee809425 100644 --- a/cryptography/hazmat/bindings/commoncrypto/binding.py +++ b/cryptography/hazmat/bindings/commoncrypto/binding.py @@ -47,5 +47,5 @@ class Binding(object): @classmethod def is_available(cls): - return sys.platform == "darwin" and map( - int, platform.mac_ver()[0].split(".")) >= [10, 8, 0] + return sys.platform == "darwin" and list(map( + int, platform.mac_ver()[0].split("."))) >= [10, 8, 0] -- cgit v1.2.3