Use consistent names for fd sets in all pollers

supervisor/poller.py

@@ -36,16 +36,16 @@ class SelectPoller(BasePoller):
         self._init_fdsets()
 
     def register_readable(self, fd):
-        self.readable.add(fd)
+        self.readables.add(fd)
 
     def register_writable(self, fd):
-        self.writable.add(fd)
+        self.writables.add(fd)
 
     def unregister(self, fd):
-        if fd in self.readable:
-            self.readable.remove(fd)
-        if fd in self.writable:
-            self.writable.remove(fd)
+        if fd in self.readables:
+            self.readables.remove(fd)
+        if fd in self.writables:
+            self.writables.remove(fd)
 
     def unregister_all(self):
         self._init_fdsets()
@@ -53,8 +53,8 @@ class SelectPoller(BasePoller):
     def poll(self, timeout):
         try:
             r, w, x = self._select.select(
-                self.readable,
-                self.writable,
+                self.readables,
+                self.writables,
                 [], timeout
                 )
         except select.error as err:
@@ -69,8 +69,8 @@ class SelectPoller(BasePoller):
         return r, w
 
     def _init_fdsets(self):
-        self.readable = set()
-        self.writable = set()
+        self.readables = set()
+        self.writables = set()
 
 class PollPoller(BasePoller):
 

supervisor/tests/test_poller.py

@@ -22,13 +22,13 @@ class SelectPollerTests(unittest.TestCase):
         poller = self._makeOne(DummyOptions())
         poller.register_readable(6)
         poller.register_readable(7)
-        self.assertEqual(sorted(poller.readable), [6,7])
+        self.assertEqual(sorted(poller.readables), [6,7])
 
     def test_register_writable(self):
         poller = self._makeOne(DummyOptions())
         poller.register_writable(6)
         poller.register_writable(7)
-        self.assertEqual(sorted(poller.writable), [6,7])
+        self.assertEqual(sorted(poller.writables), [6,7])
 
     def test_poll_returns_readables_and_writables(self):
         _select = DummySelect(result={'readables': [6],
@@ -59,8 +59,8 @@ class SelectPollerTests(unittest.TestCase):
         poller.register_readable(6)
         poller.poll(1)
         self.assertEqual(options.logger.data[0], 'EBADF encountered in poll')
-        self.assertEqual(list(poller.readable), [])
-        self.assertEqual(list(poller.writable), [])
+        self.assertEqual(list(poller.readables), [])
+        self.assertEqual(list(poller.writables), [])
 
     def test_poll_uncaught_exception(self):
         _select = DummySelect(error=errno.EPERM)