Merge pull request #1153 from bmerry/unregister-ready-poller

Unregister socket from ready_poller

2 files changed, 3 insertions, 1 deletions

diff --git a/redis/connection.py b/redis/connection.py
index beeba30..851690f 100755
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -581,6 +581,8 @@ class Connection(object):
         self._parser.on_disconnect()
         if self._sock is None:
             return
+        self._selector.close()
+        self._selector = None
         try:
             if os.getpid() == self.pid:
                 self._sock.shutdown(socket.SHUT_RDWR)
diff --git a/redis/selector.py b/redis/selector.py
index 8c0ab8a..bce84a5 100644
--- a/redis/selector.py
+++ b/redis/selector.py
@@ -131,7 +131,7 @@ if hasattr(select, 'poll'):
             """
             for poller in (self.read_poller, self.ready_poller):
                 try:
-                    self.read_poller.unregister(self.sock)
+                    poller.unregister(self.sock)
                 except (KeyError, ValueError):
                     # KeyError is raised if somehow the socket was not
                     #   registered