Merge ~cjwatson/txpkgupload:py3-close-log-file into txpkgupload:master

[Colin Watson]

Silence ResourceWarnings due to an open log file

We need to explicitly close the service's log file if we opened one.

[Thiago F. Pappacena (pappacena)]

review: Approve

diff --git a/src/txpkgupload/services.py b/src/txpkgupload/services.py
index 89e9e4d..613ff30 100644
--- a/src/txpkgupload/services.py
+++ b/src/txpkgupload/services.py
@@ -63,10 +63,11 @@ class PkgUploadServices(MultiService):
     """Container for package upload services."""
 
     def __init__(self, oops_dir, oops_reporter, server_argv=None):
-        MultiService.__init__(self)
+        super(PkgUploadServices, self).__init__()
         self.oops_dir = oops_dir
         self.oops_reporter = oops_reporter
         self.server_argv = server_argv
+        self._log_file = None
 
     def _getLogObserver(self):
         # We unfortunately have to clone-and-hack part of
@@ -88,7 +89,7 @@ class PkgUploadServices(MultiService):
         else:
             if not logfilename:
                 logfilename = "txpkgupload.log"
-            logFile = LogFile.fromFullPath(
+            self._log_file = logFile = LogFile.fromFullPath(
                 logfilename, rotateLength=None, defaultMode=0o644)
             # Override if signal is set to None or SIG_DFL (0)
             if not signal.getsignal(signal.SIGUSR1):
@@ -110,8 +111,14 @@ class PkgUploadServices(MultiService):
         return oops_observer.emit
 
     def setServiceParent(self, parent):
-        MultiService.setServiceParent(self, parent)
+        super(PkgUploadServices, self).setServiceParent(parent)
         if isinstance(parent, Componentized):
             # Customise the application's logging.  We don't get much of an
             # opportunity to do this otherwise.
             parent.setComponent(log.ILogObserver, self._getLogObserver())
+
+    def disownServiceParent(self):
+        if self._log_file is not None:
+            self._log_file.close()
+            self._log_file = None
+        super(PkgUploadServices, self).disownServiceParent()
diff --git a/src/txpkgupload/tests/test_plugin.py b/src/txpkgupload/tests/test_plugin.py
index 610a27e..183de40 100644
--- a/src/txpkgupload/tests/test_plugin.py
+++ b/src/txpkgupload/tests/test_plugin.py
@@ -230,6 +230,7 @@ class PkgUploadFixture(DeferringFixture):
         # runner would, and start the service.
         application = Application(self.service_maker.tapname)
         self.service.setServiceParent(application)
+        self.addCleanup(self.service.disownServiceParent)
         self.observer = application.getComponent(log.ILogObserver, None)
         log.addObserver(self.observer)
         self.addCleanup(log.removeObserver, self.observer)