merge a few changes from pull requests into py3 branch from master

supervisor/loggers.py

@@ -92,10 +92,10 @@ class Handler:
                 self.stream.write(msg.encode("UTF-8"))
             self.flush()
         except:
-            self.handleError(record)
+            self.handleError()
 
     #noinspection PyUnusedLocal
-    def handleError(self, record):
+    def handleError(self):
         ei = sys.exc_info()
         traceback.print_exception(ei[0], ei[1], ei[2], None, sys.stderr)
         del ei
@@ -199,6 +199,17 @@ class RotatingFileHandler(FileHandler):
         FileHandler.emit(self, record)
         self.doRollover()
 
+    def removeAndRename(self, sfn, dfn):
+        if os.path.exists(dfn):
+            try:
+                os.remove(dfn)
+            except OSError:
+                why = sys.exc_info()[1]
+                # catch race condition (already deleted)
+                if why.args[0] != errno.ENOENT:
+                    raise
+        os.rename(sfn, dfn)
+
     def doRollover(self):
         """
         Do a rollover, as described in __init__().
@@ -215,25 +226,9 @@ class RotatingFileHandler(FileHandler):
                 sfn = "%s.%d" % (self.baseFilename, i)
                 dfn = "%s.%d" % (self.baseFilename, i + 1)
                 if os.path.exists(sfn):
-                    if os.path.exists(dfn):
-                        try:
-                            os.remove(dfn)
-                        except OSError:
-                            why = sys.exc_info()[1]
-                            # catch race condition (already deleted)
-                            if why.args[0] != errno.ENOENT:
-                                raise
-                    os.rename(sfn, dfn)
+                    self.removeAndRename(sfn, dfn)
             dfn = self.baseFilename + ".1"
-            if os.path.exists(dfn):
-                try:
-                    os.remove(dfn)
-                except OSError:
-                    why = sys.exc_info()[1]
-                    # catch race condition (already deleted)
-                    if why.args[0] != errno.ENOENT:
-                        raise
-            os.rename(self.baseFilename, dfn)
+            self.removeAndRename(self.baseFilename, dfn)
         self.stream = open(self.baseFilename, 'w')
 
 class LogRecord:
@@ -335,7 +330,7 @@ class SyslogHandler(Handler):
                 except UnicodeError:
                     syslog.syslog(msg.encode("UTF-8"))
         except:
-            self.handleError(record)
+            self.handleError()
 
 def getLogger(level=None):
     return Logger(level)