[Python-checkins] cpython (merge 3.2 -> 3.3): Issue #16168: Merged SysLogHandler update from 3.2.

[vinay.sajip]

http://hg.python.org/cpython/rev/e4212f81d633
changeset:   79609:e4212f81d633
branch:      3.3
parent:      79603:0ef3b801ccbc
parent:      79608:f41e6ef3392a
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Tue Oct 09 08:22:01 2012 +0100
summary:
  Issue #16168: Merged SysLogHandler update from 3.2.

files:
  Lib/logging/handlers.py |  10 ++--------
  1 files changed, 2 insertions(+), 8 deletions(-)


diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -794,18 +794,12 @@
         self.formatter = None
 
     def _connect_unixsocket(self, address):
-        self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
-        # syslog may require either DGRAM or STREAM sockets
+        self.socket = socket.socket(socket.AF_UNIX, self.socktype)
         try:
             self.socket.connect(address)
         except socket.error:
             self.socket.close()
-            self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            try:
-                self.socket.connect(address)
-            except socket.error:
-                self.socket.close()
-                raise
+            raise
 
     def encodePriority(self, facility, priority):
         """

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