]> granicus.if.org Git - python/commitdiff
Merged fix added for recent changes in non-threading environments.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 23 Feb 2012 20:51:18 +0000 (20:51 +0000)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Thu, 23 Feb 2012 20:51:18 +0000 (20:51 +0000)
1  2 
Lib/logging/__init__.py
Lib/logging/handlers.py

Simple merge
index 0107853cfa8b01673e97b16674d91e25c218c435,708edc51ac76184668846ebed8d7151944df6b68..ee0096a8cb79ae16fe3be6eb481d47d0ec1ed717
@@@ -792,9 -755,13 +795,12 @@@ class SysLogHandler(logging.Handler)
          """
          Closes the socket.
          """
-         with self.lock:
+         self.acquire()
+         try:
 -            if self.unixsocket:
 -                self.socket.close()
 +            self.socket.close()
              logging.Handler.close(self)
+         finally:
+             self.release()
  
      def mapPriority(self, levelName):
          """