Merge lp:~cjwatson/txpkgupload/twisted-18.4.0 into lp:~lazr-developers/txpkgupload/trunk

[Colin Watson]

Upgrade to Twisted 18.4.0.

I also upgraded testtools and fixtures while I was here.

[Adam Collard (adam-collard)]

+1

review: Approve

=== modified file 'requirements.txt'
--- requirements.txt	2018-07-02 12:43:42 +0000
+++ requirements.txt	2018-07-04 10:41:54 +0000
@@ -7,8 +7,8 @@
 constantly==15.1.0
 cryptography==2.1.4
 enum34==1.1.6
-extras==0.0.3
-fixtures==0.3.12
+extras==1.0.0
+fixtures==3.0.0
 FormEncode==1.2.4
 gmpy==1.17
 httplib2==0.8
@@ -37,9 +37,9 @@
 PyYAML==3.10
 six==1.9.0
 testresources==0.2.7
-testtools==1.8.1
+testtools==2.3.0
 traceback2==1.4.0
-Twisted[conch]==17.9.0
+Twisted[conch]==18.4.0
 unittest2==1.0.1
 wadllib==1.3.2
 wsgi-intercept==0.5.1

=== modified file 'src/txpkgupload/tests/test_plugin.py'
--- src/txpkgupload/tests/test_plugin.py	2018-07-04 09:58:55 +0000
+++ src/txpkgupload/tests/test_plugin.py	2018-07-04 10:41:54 +0000
@@ -23,11 +23,11 @@
 from lazr.sshserver.auth import NoSuchPersonWithName
 from testtools import TestCase
 from testtools.compat import reraise
-from testtools.deferredruntest import AsynchronousDeferredRunTest
 from testtools.matchers import (
     MatchesException,
     Raises,
     )
+from testtools.twistedsupport import AsynchronousDeferredRunTest
 from twisted.application.service import (
     Application,
     IService,
@@ -129,7 +129,7 @@
 
     def test_load(self):
         # Configuration can be loaded and parsed from a file.
-        filename = os.path.join(self.useFixture(TempDir()).path, "config.yaml")
+        filename = self.useFixture(TempDir()).join("config.yaml")
         with open(filename, "w") as stream:
             stream.write('access_log: "/some/where.log"')
         observed = Config.load(filename)
@@ -195,8 +195,7 @@
     def logfile(self):
         return os.path.join(self.root, "txpkgupload.log")
 
-    def setUp(self):
-        super(PkgUploadFixture, self).setUp()
+    def _setUp(self):
         self.root = self.useFixture(TempDir()).path
         top = os.path.join(
             os.path.dirname(__file__), os.pardir, os.pardir, os.pardir)
@@ -273,8 +272,7 @@
             config = yaml.load(stream)
         self.port = config["ftp"]["port"]
 
-    def setUp(self):
-        super(FTPServer, self).setUp()
+    def _setUp(self):
         os.mkdir(self.fsroot)
         os.mkdir(self.temp_dir)
         self.pkgupload = self.useFixture(PkgUploadFixture(dedent("""\
@@ -402,8 +400,7 @@
         self.useFixture(EnvironmentVariableFixture('SSH_AUTH_SOCK', None))
         self.useFixture(EnvironmentVariableFixture('BZR_SSH', 'paramiko'))
 
-    def setUp(self):
-        super(SFTPServer, self).setUp()
+    def _setUp(self):
         self.authserver = FakeAuthServerService()
         self.authserver_listener = reactor.listenTCP(
             0, server.Site(self.authserver))
@@ -712,9 +709,9 @@
         yield self.server.createFile(client, "foo/bar/baz", "fake contents")
         directory = yield client.openDirectory(".")
         try:
-            entry = yield directory.next()
+            entry = yield next(directory)
             raise AssertionError("Directory not empty")
-        except EOFError:
+        except StopIteration:
             pass
         yield directory.close()
 

=== modified file 'src/txpkgupload/tests/test_twistedsftp.py'
--- src/txpkgupload/tests/test_twistedsftp.py	2018-07-04 09:58:55 +0000
+++ src/txpkgupload/tests/test_twistedsftp.py	2018-07-04 10:41:54 +0000
@@ -24,12 +24,12 @@
 class TestSFTPServer(testtools.TestCase):
 
     def setUp(self):
-        temp_dir = self.useFixture(fixtures.TempDir()).path
-        fs_root = os.path.join(temp_dir, "incoming")
-        temp_dir = os.path.join(temp_dir, "tmp-incoming")
+        temp_dir = self.useFixture(fixtures.TempDir())
+        fs_root = temp_dir.join("incoming")
+        temp_incoming = temp_dir.join("tmp-incoming")
         os.mkdir(fs_root)
-        os.mkdir(temp_dir)
-        self.sftp_server = SFTPServer(MockAvatar(fs_root, temp_dir))
+        os.mkdir(temp_incoming)
+        self.sftp_server = SFTPServer(MockAvatar(fs_root, temp_incoming))
         super(TestSFTPServer, self).setUp()
 
     def assertPermissions(self, expected, file_name):

=== modified file 'src/txpkgupload/twistedsftp.py'
--- src/txpkgupload/twistedsftp.py	2018-07-04 10:04:49 +0000
+++ src/txpkgupload/twistedsftp.py	2018-07-04 10:41:54 +0000
@@ -132,9 +132,11 @@
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         raise StopIteration
 
+    next = __next__
+
     def close(self):
         pass