[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, 6 insertions, 2 deletions

diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
index 7516ff43e..117b381e9 100644
--- a/deluge/ui/web/server.py
+++ b/deluge/ui/web/server.py
@@ -19,7 +19,7 @@ import tempfile
 from OpenSSL.crypto import FILETYPE_PEM
 from twisted.application import internet, service
 from twisted.internet import defer, reactor
-from twisted.internet.ssl import SSL, Certificate, CertificateOptions, KeyPair
+from twisted.internet.ssl import SSL, Certificate, CertificateOptions, KeyPair, TLSVersion
 from twisted.web import http, resource, server, static
 
 from deluge import common, component, configmanager
@@ -668,7 +668,11 @@ class DelugeWeb(component.Component):
             certificate = Certificate.loadPEM(cert.read()).original
         with open(configmanager.get_config_dir(self.pkey)) as pkey:
             private_key = KeyPair.load(pkey.read(), FILETYPE_PEM).original
-        options = CertificateOptions(privateKey=private_key, certificate=certificate, method=SSL.SSLv23_METHOD)
+        options = CertificateOptions(
+            privateKey=private_key,
+            certificate=certificate,
+            raiseMinimumTo=TLSVersion.TLSv1_2,
+        )
         ctx = options.getContext()
         ctx.set_options(SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3)
         ctx.use_certificate_chain_file(configmanager.get_config_dir(self.cert))