diff -r 377a50f8cb8b Doc/library/select.rst
--- a/Doc/library/select.rst	Fri Nov 16 13:17:59 2012 +0200
+++ b/Doc/library/select.rst	Fri Nov 16 17:09:34 2012 +0200
@@ -47,11 +47,14 @@
    to :const:`EPOLL_CLOEXEC`, which causes the epoll descriptor to be closed
    automatically when :func:`os.execve` is called. See section
    :ref:`epoll-objects` below for the methods supported by epolling objects.
-
+   They also support the :keyword:`with` statement.
 
    .. versionchanged:: 3.3
       Added the *flags* parameter.
 
+   .. versionchanged:: 3.4
+      Support for the :keyword:`with` statement was added.
+
 
 .. function:: poll()
 
diff -r 377a50f8cb8b Lib/test/test_epoll.py
--- a/Lib/test/test_epoll.py	Fri Nov 16 13:17:59 2012 +0200
+++ b/Lib/test/test_epoll.py	Fri Nov 16 17:09:34 2012 +0200
@@ -87,6 +87,13 @@
         self.assertRaises(TypeError, select.epoll, ['foo'])
         self.assertRaises(TypeError, select.epoll, {})
 
+    def test_context_manager(self):
+        with select.epoll(16) as ep:
+            self.assertGreater(ep.fileno(), 0)
+            self.assertFalse(ep.closed)
+        self.assertTrue(ep.closed)
+        self.assertRaises(ValueError, ep.fileno)
+
     def test_add(self):
         server, client = self._connected_pair()
 
diff -r 377a50f8cb8b Modules/selectmodule.c
--- a/Modules/selectmodule.c	Fri Nov 16 13:17:59 2012 +0200
+++ b/Modules/selectmodule.c	Fri Nov 16 17:09:34 2012 +0200
@@ -1394,6 +1394,24 @@
 in seconds (as float). -1 makes poll wait indefinitely.\n\
 Up to maxevents are returned to the caller.");
 
+static PyObject *
+pyepoll_enter(pyEpoll_Object *self, PyObject *args)
+{
+    if (self->epfd < 0)
+        return pyepoll_err_closed();
+
+    Py_INCREF(self);
+    return (PyObject *)self;
+}
+
+static PyObject *
+pyepoll_exit(PyObject *self, PyObject *args)
+{
+    _Py_IDENTIFIER(close);
+
+    return _PyObject_CallMethodId(self, &PyId_close, NULL);
+}
+
 static PyMethodDef pyepoll_methods[] = {
     {"fromfd",          (PyCFunction)pyepoll_fromfd,
      METH_VARARGS | METH_CLASS, pyepoll_fromfd_doc},
@@ -1409,6 +1427,10 @@
      METH_VARARGS | METH_KEYWORDS,      pyepoll_unregister_doc},
     {"poll",            (PyCFunction)pyepoll_poll,
      METH_VARARGS | METH_KEYWORDS,      pyepoll_poll_doc},
+    {"__enter__",           (PyCFunction)pyepoll_enter,     METH_NOARGS,
+     NULL},
+    {"__exit__",           (PyCFunction)pyepoll_exit,     METH_VARARGS,
+     NULL},
     {NULL,      NULL},
 };