summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2012-10-22 10:44:53 -0700
committerGuido van Rossum <guido@python.org>2012-10-22 10:44:53 -0700
commitbbf25ded90e0af14d15a310be8921cd261c80deb (patch)
tree6e3d02087ab1301fb8f29f3a2d018365ac3bb427
parentfdbc5a17d227b277592fd85aff5200ccab3f0f77 (diff)
downloadtrollius-bbf25ded90e0af14d15a310be8921cd261c80deb.tar.gz
Apparently epoll() does not need to check for EPOLLHUP.
-rw-r--r--main.py3
-rw-r--r--polling.py6
2 files changed, 7 insertions, 2 deletions
diff --git a/main.py b/main.py
index 0a01303..52a0fef 100644
--- a/main.py
+++ b/main.py
@@ -38,6 +38,9 @@ import select
import socket
import time
+# Initialize logging before we import polling.
+logging.basicConfig(level=logging.INFO)
+
# Local imports (keep in alphabetic order).
import polling
diff --git a/polling.py b/polling.py
index 28cc03c..a85d8af 100644
--- a/polling.py
+++ b/polling.py
@@ -147,11 +147,11 @@ class EPollMixin(PollsterBase):
timeout = -1 # epoll.poll() uses -1 to mean "wait forever".
events = []
for fd, eventmask in self._epoll.poll(timeout):
- if eventmask & (select.EPOLLIN | select.EPOLLHUP):
+ if eventmask & select.EPOLLIN:
if fd in self.readers:
callback, args = self.readers[fd]
events.append((fd, eventmask, callback, args))
- if eventmask & (select.EPOLLOUT | select.EPOLLHUP):
+ if eventmask & select.EPOLLOUT:
if fd in self.writers:
callback, args = self.writers[fd]
events.append((fd, eventmask, callback, args))
@@ -266,6 +266,8 @@ elif hasattr(select, 'poll'): # Newer UNIX
else: # All UNIX; Windows (for sockets only)
poll_base = SelectMixin
+logging.info('Using Pollster base class %r', poll_base.__name__)
+
class Pollster(EventLoopMixin, poll_base):
pass