ParallelSSH
diff --git a/‎Changelog.rst‎
Lines changed: 13 additions & 0 deletions b/‎Changelog.rst‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎requirements_dev.txt‎
Lines changed: 3 additions & 1 deletion b/‎requirements_dev.txt‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎ssh2/extras.c‎
Lines changed: 167 additions & 96 deletions b/‎ssh2/extras.c‎
Lines changed: 167 additions & 96 deletions
diff --git a/‎ssh2/extras.pyx‎
Lines changed: 4 additions & 2 deletions b/‎ssh2/extras.pyx‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎ssh2/session.c‎
Lines changed: 4 additions & 4 deletions b/‎ssh2/session.c‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎ssh2/utils.c‎
Lines changed: 647 additions & 546 deletions b/‎ssh2/utils.c‎
Lines changed: 647 additions & 546 deletions
diff --git a/‎ssh2/utils.pyx‎
Lines changed: 6 additions & 6 deletions b/‎ssh2/utils.pyx‎
Lines changed: 6 additions & 6 deletions
@@ -1,6 +1,19 @@
 Change Log
 =============
 
+1.1.3
+++++++
+
+Changes
+--------
+
+* ``ssh2.utils.version()`` now returns a string.
+
+Fixes
+-------
+
+
+
 1.1.2
 ++++++
 
 
@@ -1,5 +1,7 @@
 cython
-flake8
+flake8>=3.0.0
+flake8-annotations
+flake-type-annotations-plugin
 jinja2
 pytest
 pytest-rerunfailures
 
@@ -1,11 +1,13 @@
 """
 Additional functionality not part of the libssh2 API.
 """
+from typing import Callable
+
 from . cimport error_codes
 from .utils import find_eol
 
 
-def eagain_errcode(func, poller_func, *args, **kwargs):
+def eagain_errcode(func: Callable, poller_func: Callable, *args, **kwargs):
     """Helper function for reading in non-blocking mode.
 
     Any additional arguments and keyword arguments provided are used as arguments to the session function `func`.
@@ -24,7 +26,7 @@ def eagain_errcode(func, poller_func, *args, **kwargs):
     return ret
 
 
-def eagain_write_errcode(write_func, poller_func, bytes data):
+def eagain_write_errcode(write_func: Callable, poller_func: Callable, bytes data: bytes):
     """Helper function for writing in non-blocking mode.
 
     Any additional arguments and keyword arguments provided are used as arguments to the session function `write_func`.
 
@@ -15,6 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 from select import select
+from typing import Iterable, Tuple
 
 from cpython.version cimport PY_MAJOR_VERSION
 
@@ -48,7 +49,7 @@ cdef object to_str_len(char *c_str, int length):
     return c_str[:length].decode(ENCODING)
 
 
-def find_eol(bytes buf, Py_ssize_t pos):
+def find_eol(bytes buf: bytes, Py_ssize_t pos: Py_ssize_t) -> Tuple(int, int):
     """Find end-of-line in buffer from position and return end position of
     line and where next find_eol should start from.
 
@@ -75,7 +76,7 @@ def find_eol(bytes buf, Py_ssize_t pos):
     return index, new_pos
 
 
-def readline(buf):
+def readline(buf: Iterable) -> Iterable:
     """Returns a generator of line by line output in given iterable buffer.
 
     :param buf: The iterable buffer to read from. Should yield a block of data per iteration.
@@ -109,7 +110,7 @@ def readline(buf):
         yield remainder
 
 
-def version(int required_version=0):
+def version(int required_version=0) -> str:
     """Get libssh2 version string.
 
     Passing in a non-zero required_version causes the function to return
@@ -123,16 +124,15 @@ def version(int required_version=0):
         version = c_ssh2.libssh2_version(required_version)
     if version is NULL:
         return
-    return version
+    return to_str(version)
 
 
 def ssh2_exit():
     """Call libssh2_exit"""
     c_ssh2.libssh2_exit()
 
 
-
-def wait_socket(_socket not None, Session session, timeout=1):
+def wait_socket(_socket not None, Session session: "Session", timeout=1):
     """Helper function for testing non-blocking mode.
 
     This function blocks the calling thread for <timeout> seconds -