Merge lp:~mwhudson/launchpad/twisted-x into lp:launchpad

[Michael Hudson-Doyle]

Upgrade to Twisted 10.0.0

Let's use Twisted 10.

[Tim Penhey (thumper)]

I love the RED in the diff :-)

review: Approve

=== modified file 'lib/canonical/twistedsupport/tests/test_processmonitor.py'
--- lib/canonical/twistedsupport/tests/test_processmonitor.py	2009-11-22 20:17:36 +0000
+++ lib/canonical/twistedsupport/tests/test_processmonitor.py	2010-03-10 01:30:47 +0000
@@ -318,13 +318,6 @@
 
     layer = TwistedLayer
 
-    def setUp(self):
-        # XXX 2009-11-23, MichaelHudson,
-        # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
-        # make sure the reactor is running when the test method is executed to
-        # work around the linked Twisted bug.
-        return task.deferLater(reactor, 0, lambda: None)
-
     def test_run_process_with_timeout_invalid_args(self):
         # `run_process_with_timeout` expects the process 'args' to be a
         # tuple.
 
=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2010-03-06 00:32:52 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2010-03-10 01:30:47 +0000
@@ -43,11 +43,6 @@
         TrialTestCase.setUp(self)
         self.slave = RecordingSlave(
             'foo', 'http://foo:8221/rpc', 'foo.host')
-        # XXX 2009-11-23, MichaelHudson,
-        # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
-        # make sure the reactor is running when the test method is executed to
-        # work around the linked Twisted bug.
-        return task.deferLater(reactor, 0, lambda: None)
 
     def test_representation(self):
         """`RecordingSlave` has a custom representation.
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_workermonitor.py'
--- lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2010-02-24 10:18:16 +0000
+++ lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2010-03-10 01:30:47 +0000
@@ -695,11 +695,6 @@
     def setUp(self):
         TestWorkerMonitorIntegration.setUp(self)
         self._protocol = None
-        # XXX 2009-11-23, MichaelHudson,
-        # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
-        # make sure the reactor is running when the test method is executed to
-        # work around the linked Twisted bug.
-        return task.deferLater(reactor, 0, lambda: None)
 
     def performImport(self, job_id):
         """Perform the import job with ID job_id.
 
=== modified file 'lib/lp/codehosting/puller/tests/test_scheduler.py'
--- lib/lp/codehosting/puller/tests/test_scheduler.py	2010-02-24 04:24:01 +0000
+++ lib/lp/codehosting/puller/tests/test_scheduler.py	2010-03-10 01:30:47 +0000
@@ -662,11 +662,6 @@
         self.bzr_tree.commit('rev1')
         self.pushToBranch(self.db_branch, self.bzr_tree)
         self.client = FakePullerEndpointProxy()
-        # XXX 2009-11-23, MichaelHudson,
-        # bug=http://twistedmatrix.com/trac/ticket/2078: This is a hack to
-        # make sure the reactor is running when the test method is executed to
-        # work around the linked Twisted bug.
-        return task.deferLater(reactor, 0, lambda: None)
 
     def run(self, result):
         # We want to use Trial's run() method so we can return Deferreds.
 
=== modified file 'lib/lp/codehosting/sshserver/service.py'
--- lib/lp/codehosting/sshserver/service.py	2009-06-25 04:06:00 +0000
+++ lib/lp/codehosting/sshserver/service.py	2010-03-10 01:30:47 +0000
@@ -46,6 +46,8 @@
     to and disconnection from the SSH server.
     """
 
+    protocol = KeepAliveSettingSSHServerTransport
+
     def __init__(self, portal):
         # Although 'portal' isn't part of the defined interface for
         # `SSHFactory`, defining it here is how the `SSHUserAuthServer` gets
@@ -60,17 +62,7 @@
         The protocol object we return is slightly modified so that we can hook
         into the 'connectionLost' event and log the disconnection.
         """
-        # If Conch let us customize the protocol class, we wouldn't need this.
-        # See http://twistedmatrix.com/trac/ticket/3443.
-        transport = KeepAliveSettingSSHServerTransport()
-        transport.supportedPublicKeys = self.privateKeys.keys()
-        if not self.primes:
-            log.msg('disabling diffie-hellman-group-exchange because we '
-                    'cannot find moduli file')
-            ske = transport.supportedKeyExchanges[:]
-            ske.remove('diffie-hellman-group-exchange-sha1')
-            transport.supportedKeyExchanges = ske
-        transport.factory = self
+        transport = SSHFactory.buildProtocol(self, address)
         transport._realConnectionLost = transport.connectionLost
         transport.connectionLost = (
             lambda reason: self.connectionLost(transport, reason))
 
=== modified file 'versions.cfg'
--- versions.cfg	2010-03-02 17:24:50 +0000
+++ versions.cfg	2010-03-10 01:30:47 +0000
@@ -61,7 +61,7 @@
 storm = 0.15danilo-storm-launchpad-r342
 testtools = 0.9.2
 transaction = 1.0.0
-Twisted = 9.0.0
+Twisted = 10.0.0
 uuid = 1.30
 van.testing = 2.0.1
 wadllib = 1.1.4