Merge pull request #1 from lmctv/master

Indeed typos, something went wrong on the merge back towards the repo
Thanks for this

pika/adapters/blocking_connection.py

@@ -37,18 +37,18 @@ def _adapter_connect(self):
         BaseConnection._adapter_connect(self)
         self.socket.setblocking(1)
         # Set the timeout for reading/writing on the socket
-        self.socket.settimeout(paramaters.socket_timeout or SOCKET_TIMEOUT)
+        self.socket.settimeout(self.parameters.socket_timeout or SOCKET_TIMEOUT)
         self._socket_timeouts = 0
         self._on_connected()
         self._timeouts = dict()
 
         # When using a high availability cluster (such as HAProxy) we are always able to connect
-        # even though there might be no RabbitMQ backend. 
+        # even though there might be no RabbitMQ backend.
         socket_timeout_retries = 0
         while not self.is_open and socket_timeout_retries<SOCKET_TIMEOUT_THRESHOLD:
             self._flush_outbound()
             self._handle_read()
-            timeout_retries +=1
+            socket_timeout_retries +=1
 
         if not self.is_open:
             raise AMQPConnectionError("No connection could be opened after %s retries" % SOCKET_TIMEOUT_THRESHOLD)

pika/connection.py

@@ -145,8 +145,8 @@ def __init__(self,
             raise TypeError("retry_delay must be an int")
 
         # Validate the socket timeout delay
-        if not isinstance(socket_timeout, int):
-            raise TypeError("socket_timeout must be an int")
+        if not (isinstance(socket_timeout, int) or isinstance(socket_timeout, types.NoneType)):
+            raise TypeError("socket_timeout must be either None or int")
 
         # Assign our values
         self.host = host