Pluck more unrelated bits from #422
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index 10116ed..8ae7449 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -10,14 +10,14 @@
from six import int2byte, indexbytes
from OpenSSL._util import (
+ UNSPECIFIED as _UNSPECIFIED,
+ exception_from_error_queue as _exception_from_error_queue,
ffi as _ffi,
lib as _lib,
- exception_from_error_queue as _exception_from_error_queue,
- native as _native,
make_assert as _make_assert,
- text_to_bytes_and_warn as _text_to_bytes_and_warn,
+ native as _native,
path_string as _path_string,
- UNSPECIFIED as _UNSPECIFIED,
+ text_to_bytes_and_warn as _text_to_bytes_and_warn,
)
from OpenSSL.crypto import (
diff --git a/src/OpenSSL/_util.py b/src/OpenSSL/_util.py
index b68b11e..48bcbf5 100644
--- a/src/OpenSSL/_util.py
+++ b/src/OpenSSL/_util.py
@@ -34,7 +34,6 @@
associated with the current thread. The err library provides functions to
obtain these error codes and textual error messages.
"""
-
errors = []
while True:
@@ -56,7 +55,7 @@
"""
def openssl_assert(ok):
"""
- If ok is not true-ish, retrieve the error from OpenSSL and raise it.
+ If *ok* is not True, retrieve the error from OpenSSL and raise it.
"""
if ok is not True:
exception_from_error_queue(error)