[Python-checkins] cpython (merge 3.2 -> default): Closes #15179: Merged fix from 3.2.

[vinay.sajip]

http://hg.python.org/cpython/rev/6af0535b5e3a
changeset:   77785:6af0535b5e3a
parent:      77782:f77998006917
parent:      77784:1bc1a14feb70
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Mon Jun 25 23:20:27 2012 +0100
summary:
  Closes #15179: Merged fix from 3.2.

files:
  Lib/logging/handlers.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -801,7 +801,11 @@
         except socket.error:
             self.socket.close()
             self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            self.socket.connect(address)
+            try:
+                self.socket.connect(address)
+            except socket.error:
+                self.socket.close()
+                raise
 
     def encodePriority(self, facility, priority):
         """

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