Merge pull request #2277 from Kriechi/bump-cryptography

bump cryptography min-version

1 files changed, 7 insertions, 7 deletions

diff --git a/mitmproxy/utils/version_check.py b/mitmproxy/utils/version_check.py
index 4cf2b9e6..22d6d75c 100644
--- a/mitmproxy/utils/version_check.py
+++ b/mitmproxy/utils/version_check.py
@@ -8,17 +8,17 @@ import os.path
 
 import OpenSSL
 
-PYOPENSSL_MIN_VERSION = (0, 15)
+PYOPENSSL_MIN_VERSION = (16, 0)
 
 
 def check_pyopenssl_version(min_version=PYOPENSSL_MIN_VERSION, fp=sys.stderr):
-    min_version_str = u".".join(str(x) for x in min_version)
+    min_version_str = ".".join(str(x) for x in min_version)
     try:
         v = tuple(int(x) for x in OpenSSL.__version__.split(".")[:2])
     except ValueError:
         print(
-            u"Cannot parse pyOpenSSL version: {}"
-            u"mitmproxy requires pyOpenSSL {} or greater.".format(
+            "Cannot parse pyOpenSSL version: {}"
+            "mitmproxy requires pyOpenSSL {} or greater.".format(
                 OpenSSL.__version__, min_version_str
             ),
             file=fp
@@ -26,15 +26,15 @@ def check_pyopenssl_version(min_version=PYOPENSSL_MIN_VERSION, fp=sys.stderr):
         return
     if v < min_version:
         print(
-            u"You are using an outdated version of pyOpenSSL: "
-            u"mitmproxy requires pyOpenSSL {} or greater.".format(min_version_str),
+            "You are using an outdated version of pyOpenSSL: "
+            "mitmproxy requires pyOpenSSL {} or greater.".format(min_version_str),
             file=fp
         )
         # Some users apparently have multiple versions of pyOpenSSL installed.
         # Report which one we got.
         pyopenssl_path = os.path.dirname(inspect.getfile(OpenSSL))
         print(
-            u"Your pyOpenSSL {} installation is located at {}".format(
+            "Your pyOpenSSL {} installation is located at {}".format(
                 OpenSSL.__version__, pyopenssl_path
             ),
             file=fp