[Python-checkins] cpython (merge default -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/c4ced3719761
changeset:   70005:c4ced3719761
parent:      70004:5a3140f30740
parent:      70002:b365036b17c2
user:        Raymond Hettinger <python at rcn.com>
date:        Tue May 10 00:36:35 2011 -0700
summary:
  merge

files:
  Lib/test/test_logging.py |  9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -723,7 +723,14 @@
                               :func:`select` or :func:`poll` call by
                               :func:`asyncore.loop`.
         """
-        asyncore.loop(poll_interval, map=self.sockmap)
+        try:
+            asyncore.loop(poll_interval, map=self.sockmap)
+        except select.error:
+            # On FreeBSD 8, closing the server repeatably
+            # raises this error. We swallow it if the
+            # server has been closed.
+            if self.connected or self.accepting:
+                raise
 
     def stop(self, timeout=None):
         """

-- 
Repository URL: http://hg.python.org/cpython