Ticket #6184: 6184_v2.diff

twisted/conch/scripts/tkconch.py

@@ -371 +371 @@
         elif goodKey == 2: # AAHHHHH changed
             return defer.fail(error.ConchError('bad host key'))
         else:
-            if options['host'] == self.transport.getPeer()[1]:
+            if options['host'] == self.transport.getPeer().host:
                 host = options['host']
                 khHost = options['host']
             else:
                 host = '%s (%s)' % (options['host'],
-                                    self.transport.getPeer()[1])
+                                    self.transport.getPeer().host)
                 khHost = '%s,%s' % (options['host'],
-                                    self.transport.getPeer()[1])
+                                    self.transport.getPeer().host)
             keyType = common.getNS(pubKey)[0]
             ques = """The authenticity of host '%s' can't be established.\r
 %s key fingerprint is %s.""" % (host,

twisted/protocols/htb.py

@@ -192 +192 @@
     sweepInterval = 60 * 20
 
     def getBucketKey(self, transport):
-        return transport.getPeer()[1]
+        return transport.getPeer().host
 
 
 class FilterByServer(HierarchicalBucketFilter):

twisted/protocols/policies.py

@@ -398 +398 @@
         return WrappingFactory.buildProtocol(self, addr)
 
     def unregisterProtocol(self, p):
-        peerHost = p.getPeer()[1]
+        peerHost = p.getPeer().host
         self.peerConnections[peerHost] -= 1
         if self.peerConnections[peerHost] == 0:
             del self.peerConnections[peerHost]