From 7df670c8d0dbc6c20ed4005383943d03700870b8 Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 18 Mar 2021 20:46:18 +0100 Subject: [PATCH] core: removed `sat_tmp.twisted` patches + update minimum Twisted version: - `sat_tmp` patches are not needed anymore and cause trouble with latest Twisted (21.02) - update minimum to `20.3.0` which is the first one to support Python 3.8 --- setup.py | 2 +- twisted/plugins/sat_plugin.py | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/setup.py b/setup.py index 0c675fb2..a0a7333a 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ install_requires = [ 'pyxdg', 'sat_tmp >= 0.7.0a4', 'shortuuid', - 'twisted[tls] >= 19.7.0', + 'twisted[tls] >= 20.3.0', 'treq', 'urwid >= 1.2.0', 'urwid-satext >= 0.7.0a2', diff --git a/twisted/plugins/sat_plugin.py b/twisted/plugins/sat_plugin.py index e135a4ab..064e3698 100644 --- a/twisted/plugins/sat_plugin.py +++ b/twisted/plugins/sat_plugin.py @@ -26,12 +26,6 @@ from twisted.application.service import IServiceMaker from sat.core.constants import Const as C from sat.core.i18n import _ -# patch for Python 3.8 compatibility -from sat_tmp.twisted import install as install_twisted_patches - - -install_twisted_patches() - def initialise(options): """Method to initialise global modules"""