diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 15:35:09 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 15:35:09 +1300 |
| commit | 421679a770c811ceeeccace6310dffcbbe6362dd (patch) | |
| tree | 6bbdcfe54fcce1e41660ca07c9470f42debdec5b /netlib/version_check.py | |
| parent | 4918feb7252c76c95d85cd8b2b0334a22aaae274 (diff) | |
| parent | 8360f70024330eeeb5c53d29e4a05194f872b511 (diff) | |
| download | mitmproxy-421679a770c811ceeeccace6310dffcbbe6362dd.tar.gz mitmproxy-421679a770c811ceeeccace6310dffcbbe6362dd.tar.bz2 mitmproxy-421679a770c811ceeeccace6310dffcbbe6362dd.zip | |
Merge pull request #1613 from cortesi/python3
First-order conversion to Python3-only
Diffstat (limited to 'netlib/version_check.py')
| -rw-r--r-- | netlib/version_check.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/netlib/version_check.py b/netlib/version_check.py index 63f3e876..7091146d 100644 --- a/netlib/version_check.py +++ b/netlib/version_check.py @@ -7,7 +7,6 @@ from __future__ import division, absolute_import, print_function import sys import inspect import os.path -import six import OpenSSL @@ -15,7 +14,7 @@ PYOPENSSL_MIN_VERSION = (0, 15) def check_pyopenssl_version(min_version=PYOPENSSL_MIN_VERSION, fp=sys.stderr): - min_version_str = u".".join(six.text_type(x) for x in min_version) + min_version_str = u".".join(str(x) for x in min_version) try: v = tuple(int(x) for x in OpenSSL.__version__.split(".")[:2]) except ValueError: |