Remove native, it's behavior is confusing (#1069)

Instead just decode stuff at the call-sites -- 100% of which were passing bytes

1 files changed, 1 insertions, 18 deletions

diff --git a/src/OpenSSL/_util.py b/src/OpenSSL/_util.py
index 6bd43a5..028989d 100644
--- a/src/OpenSSL/_util.py
+++ b/src/OpenSSL/_util.py
@@ -26,7 +26,7 @@ def text(charp):
     """
     if not charp:
         return ""
-    return native(ffi.string(charp))
+    return ffi.string(charp).decode("utf-8")
 
 
 def exception_from_error_queue(exception_type):
@@ -71,23 +71,6 @@ def make_assert(error):
     return openssl_assert
 
 
-def native(s):
-    """
-    Convert :py:class:`bytes` or :py:class:`unicode` to the native
-    :py:class:`str` type, using UTF-8 encoding if conversion is necessary.
-
-    :raise UnicodeError: The input string is not UTF-8 decodeable.
-
-    :raise TypeError: The input is neither :py:class:`bytes` nor
-        :py:class:`unicode`.
-    """
-    if not isinstance(s, (bytes, str)):
-        raise TypeError("%r is neither bytes nor unicode" % s)
-    if isinstance(s, bytes):
-        return s.decode("utf-8")
-    return s
-
-
 def path_string(s):
     """
     Convert a Python path to a :py:class:`bytes` string identifying the same