fixup - decompressing recv_into() needs to handle too-big recv()

I suspect the bootstrap thing is flawed ...
but let's not fix that now (seems to have worked for a while anyway)

nsq/conn.py

@@ -323,7 +323,7 @@ def upgrade_to_deflate(self):
         # is currently in place (normal or SSL)...
         #
         # first read any compressed bytes the existing IOStream might have
-        # already buffered and use that to bootstrap the DefalteSocket, then
+        # already buffered and use that to bootstrap the DeflateSocket, then
         # monkey patch the existing IOStream by replacing its socket
         # with a wrapper that will automagically handle compression.
         existing_data = self.stream._consume(self.stream._read_buffer_size)

nsq/deflate_socket.py

@@ -26,9 +26,14 @@ def read(self, size):
 
     def recv_into(self, buf, nbytes=0):
         # no real support of efficient recv_into()
-        data = self.recv(nbytes or len(buf))
-        buf[:len(data)] = data
-        return len(data)
+        n = nbytes or len(buf)
+        data = self.recv(n)
+        r = len(data)
+        if r > n:
+            self._bootstrapped = data[n:]
+            r = n
+        buf[:r] = data[:r]
+        return r
 
     def _recv(self, size, method):
         if self._bootstrapped:

nsq/snappy_socket.py

@@ -26,9 +26,14 @@ def read(self, size):
 
     def recv_into(self, buf, nbytes=0):
         # no real support of efficient recv_into()
-        data = self.recv(nbytes or len(buf))
-        buf[:len(data)] = data
-        return len(data)
+        n = nbytes or len(buf)
+        data = self.recv(n)
+        r = len(data)
+        if r > n:
+            self._bootstrapped = data[n:]
+            r = n
+        buf[:r] = data[:r]
+        return r
 
     def _recv(self, size, method):
         if self._bootstrapped: