diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2019-11-18 00:18:50 -0500 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-11-18 13:18:50 +0800 |
commit | 1257600e1603ed57455d92758eb1da857cd61725 (patch) | |
tree | 5a5829854150a0b092b54803723fa842e6222ad6 /src/OpenSSL/_util.py | |
parent | daf6f0060959c896fd724da5ade401ec70a8d1e5 (diff) | |
download | pyopenssl-git-1257600e1603ed57455d92758eb1da857cd61725.tar.gz |
Random cleanup around our usage of binary_type (#879)
Diffstat (limited to 'src/OpenSSL/_util.py')
-rw-r--r-- | src/OpenSSL/_util.py | 8 |
1 files changed, 4 insertions, 4 deletions
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()) |