[project @ robey@master-shake.local-20060115063008-4f68552398868788]

fix a bunch of pychecker warnings, some of which were actual (but unlikely) bugs

1 files changed, 6 insertions, 4 deletions

diff --git a/paramiko/packet.py b/paramiko/packet.py
index 277d68e0..7e9afc78 100644
--- a/paramiko/packet.py
+++ b/paramiko/packet.py
@@ -219,7 +219,7 @@ class Packetizer (object):
             if n < 0:
                 raise EOFError()
             if n == len(out):
-                return
+                break
             out = out[n:]
         return
         
@@ -398,23 +398,24 @@ class Packetizer (object):
                 x = self.__socket.recv(1)
                 if len(x) == 0:
                     raise EOFError()
-                return x
+                break
             if self.__closed:
                 raise EOFError()
             now = time.time()
             if now - start >= timeout:
                 raise socket.timeout()
+        return x
 
     def _read_timeout(self, timeout):
         if PY22:
-            return self._py22_read_timeout(n)
+            return self._py22_read_timeout(timeout)
         start = time.time()
         while True:
             try:
                 x = self.__socket.recv(1)
                 if len(x) == 0:
                     raise EOFError()
-                return x
+                break
             except socket.timeout:
                 pass
             if self.__closed:
@@ -422,6 +423,7 @@ class Packetizer (object):
             now = time.time()
             if now - start >= timeout:
                 raise socket.timeout()
+        return x
 
     def _build_packet(self, payload):
         # pad up at least 4 bytes, to nearest block-size (usually 8)