diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/OpenSSL/SSL.py | 8 | ||||
-rw-r--r-- | src/OpenSSL/_util.py | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py index a228b73..ca39930 100644 --- a/src/OpenSSL/SSL.py +++ b/src/OpenSSL/SSL.py @@ -7,9 +7,7 @@ from itertools import count, chain from weakref import WeakValueDictionary from errno import errorcode -from six import ( - binary_type as _binary_type, integer_types as integer_types, int2byte, - indexbytes) +from six import integer_types, int2byte, indexbytes from OpenSSL._util import ( UNSPECIFIED as _UNSPECIFIED, @@ -461,7 +459,7 @@ class _ALPNSelectHelper(_CallbackExceptionHelper): if outbytes is NO_OVERLAPPING_PROTOCOLS: outbytes = b'' any_accepted = False - elif not isinstance(outbytes, _binary_type): + elif not isinstance(outbytes, bytes): raise TypeError( "ALPN callback must return a bytestring or the " "special NO_OVERLAPPING_PROTOCOLS sentinel value." @@ -529,7 +527,7 @@ class _OCSPServerCallbackHelper(_CallbackExceptionHelper): # Call the callback. ocsp_data = callback(conn, data) - if not isinstance(ocsp_data, _binary_type): + if not isinstance(ocsp_data, bytes): raise TypeError("OCSP callback must return a bytestring.") # If the OCSP data was provided, we will pass it to OpenSSL. diff --git a/src/OpenSSL/_util.py b/src/OpenSSL/_util.py index d8e3f66..9f2d724 100644 --- a/src/OpenSSL/_util.py +++ b/src/OpenSSL/_util.py @@ -1,7 +1,7 @@ import sys import warnings -from six import PY2, binary_type, text_type +from six import PY2, text_type from cryptography.hazmat.bindings.openssl.binding import Binding @@ -79,13 +79,13 @@ def native(s): :raise TypeError: The input is neither :py:class:`bytes` nor :py:class:`unicode`. """ - if not isinstance(s, (binary_type, text_type)): + if not isinstance(s, (bytes, text_type)): raise TypeError("%r is neither bytes nor unicode" % s) if PY2: if isinstance(s, text_type): return s.encode("utf-8") else: - if isinstance(s, binary_type): + if isinstance(s, bytes): return s.decode("utf-8") return s @@ -99,7 +99,7 @@ def path_string(s): :return: An instance of :py:class:`bytes`. """ - if isinstance(s, binary_type): + if isinstance(s, bytes): return s elif isinstance(s, text_type): return s.encode(sys.getfilesystemencoding()) |