summaryrefslogtreecommitdiff
path: root/M2Crypto/util.py
diff options
context:
space:
mode:
Diffstat (limited to 'M2Crypto/util.py')
-rw-r--r--M2Crypto/util.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/M2Crypto/util.py b/M2Crypto/util.py
index 9abf141..97f5d29 100644
--- a/M2Crypto/util.py
+++ b/M2Crypto/util.py
@@ -15,11 +15,10 @@ import binascii
import logging
import sys
-from M2Crypto import m2, py27plus, six
-if py27plus:
- from typing import Any, AnyStr, Optional, Tuple, Union # noqa
- # see https://github.com/python/typeshed/issues/222
- AddrType = Union[Tuple[str, int], str]
+from M2Crypto import m2, six
+from typing import Any, Optional, TextIO, Tuple, Union # noqa
+# see https://github.com/python/typeshed/issues/222
+AddrType = Union[Tuple[str, int], str]
log = logging.getLogger('util')
@@ -27,6 +26,7 @@ log = logging.getLogger('util')
class UtilError(Exception):
pass
+
m2.util_init(UtilError)
@@ -55,7 +55,7 @@ def octx_to_num(x):
def genparam_callback(p, n, out=sys.stdout):
- # type: (int, Any, file) -> None
+ # type: (int, Any, TextIO) -> None
ch = ['.', '+', '*', '\n']
out.write(ch[p])
out.flush()