summaryrefslogtreecommitdiff
path: root/paramiko/packet.py
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-02-26 14:29:07 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-02-26 14:29:07 -0800
commit3f34ea48dbb5d0666f61a3e7db2504615e677757 (patch)
treeb50769c51398e56ebdf94bdca59320ff772a2d67 /paramiko/packet.py
parent8ddaac24ae746846a31153b8b93c275b30de8f0d (diff)
downloadparamiko-3f34ea48dbb5d0666f61a3e7db2504615e677757.tar.gz
Bunch more info fields
Diffstat (limited to 'paramiko/packet.py')
-rw-r--r--paramiko/packet.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/paramiko/packet.py b/paramiko/packet.py
index 0f8152fa..397193cd 100644
--- a/paramiko/packet.py
+++ b/paramiko/packet.py
@@ -171,8 +171,6 @@ class Packetizer (object):
Returns ``True`` if a new set of keys needs to be negotiated. This
will be triggered during a packet read or write, so it should be
checked after every read or write, or at least after every few.
-
- :return: ``True`` if a new set of keys needs to be negotiated
"""
return self.__need_rekey
@@ -190,12 +188,11 @@ class Packetizer (object):
"""
Read as close to N bytes as possible, blocking as long as necessary.
- :param n: number of bytes to read
- :type n: int
- :return: the data read
- :rtype: str
- :raises EOFError: if the socket was closed before all the bytes could
- be read
+ :param int n: number of bytes to read
+ :return: the data read, as a `str`
+
+ :raises EOFError:
+ if the socket was closed before all the bytes could be read
"""
out = ''
# handle over-reading from reading the banner line