[Py3] A large set of fixes for tests to pass under Python 3

The usual minor fixes for unicode/bytes for library calls.

The minimum Twisted version is now 16 for Python 3 support so remove old
code and start replacing deprecated methods.

Raised the minimum TLS version to 1.2 for the web server.

1 files changed, 14 insertions, 6 deletions

diff --git a/deluge/core/core.py b/deluge/core/core.py
index 387e32488..1a3d164a4 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -19,7 +19,7 @@ import threading
 from base64 import b64decode, b64encode
 
 from twisted.internet import defer, reactor, task
-from twisted.web.client import getPage
+from twisted.web.client import Agent, readBody
 
 import deluge.common
 import deluge.component as component
@@ -1116,13 +1116,21 @@ class Core(component.Component):
         :rtype: bool
 
         """
-        d = getPage(
-            b'http://deluge-torrent.org/test_port.php?port=%s' %
-            self.get_listen_port(), timeout=30,
+        port = self.get_listen_port()
+        url = 'https://deluge-torrent.org/test_port.php?port=%s' % port
+        agent = Agent(reactor, connectTimeout=30)
+        d = agent.request(
+            b'GET',
+            url.encode('utf-8'),
         )
 
-        def on_get_page(result):
-            return bool(int(result))
+        def on_get_page(response):
+            d = readBody(response)
+            d.addCallback(on_read_body)
+            return d
+
+        def on_read_body(body):
+            return bool(int(body))
 
         def on_error(failure):
             log.warning('Error testing listen port: %s', failure)