Merge pull request #9 from brentru/fix-socket

Fix TypeError on recv

adafruit_wiznet5k/adafruit_wiznet5k_socket.py

@@ -97,7 +97,7 @@ def __init__(self, family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None, sockn
 
         self._socknum = _the_interface.get_socket(SOCKETS)
         SOCKETS.append(self._socknum)
-        self.settimeout(1)
+        self.settimeout(self._timeout)
 
     @property
     def socknum(self):
@@ -186,9 +186,11 @@ def recv(self, bufsize=0): #pylint: disable=too-many-branches
             return ret
         stamp = time.monotonic()
 
+
         to_read = bufsize - len(self._buffer)
         received = []
         while to_read > 0:
+            # print("Bytes to read:", to_read)
             if self._sock_type == SOCK_STREAM:
                 avail = self.available()
             elif self._sock_type == SOCK_DGRAM:
@@ -199,6 +201,7 @@ def recv(self, bufsize=0): #pylint: disable=too-many-branches
                     recv = _the_interface.socket_read(self.socknum, min(to_read, avail))[1]
                 elif self._sock_type == SOCK_DGRAM:
                     recv = _the_interface.read_udp(self.socknum, min(to_read, avail))[1]
+                recv = bytes(recv)
                 received.append(recv)
                 to_read -= len(recv)
                 gc.collect()