From d9efe1cf46d99cd54620e3b437629e513c3acab3 Mon Sep 17 00:00:00 2001 From: Kashiko Koibumi Date: Thu, 30 May 2024 11:15:11 +0900 Subject: [PATCH] fix for newer versions of Python3 --- src/bitmessageqt/__init__.py | 7 ++++--- src/bitmessageqt/foldertree.py | 5 ++++- src/shutdown.py | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 60ab3c82..dd55124e 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -840,9 +840,10 @@ class MyForm(settingsmixin.SMainWindow): TTL = config.getint('bitmessagesettings', 'ttl') if TTL < 3600: # an hour TTL = 3600 - elif TTL > 28*24*60*60: # 28 days - TTL = 28*24*60*60 - self.ui.horizontalSliderTTL.setSliderPosition((TTL - 3600) ** (1/3.199)) + elif TTL > 28 * 24 * 60 * 60: # 28 days + TTL = 28 * 24 * 60 * 60 + self.ui.horizontalSliderTTL.setSliderPosition( + int((TTL - 3600) ** (1 / 3.199))) self.updateHumanFriendlyTTLDescription(TTL) QtCore.QObject.connect(self.ui.horizontalSliderTTL, QtCore.SIGNAL( diff --git a/src/bitmessageqt/foldertree.py b/src/bitmessageqt/foldertree.py index 2d3cf01d..7b40c669 100644 --- a/src/bitmessageqt/foldertree.py +++ b/src/bitmessageqt/foldertree.py @@ -4,7 +4,10 @@ Folder tree and messagelist widgets definitions. # pylint: disable=too-many-arguments,bad-super-call # pylint: disable=attribute-defined-outside-init -from cgi import escape +try: + from cgi import escape +except ImportError: + from html import escape from unqstr import ustr, unic from PyQt4 import QtCore, QtGui diff --git a/src/shutdown.py b/src/shutdown.py index 441d655e..7b875f64 100644 --- a/src/shutdown.py +++ b/src/shutdown.py @@ -23,7 +23,11 @@ def doCleanShutdown(): objectProcessorQueue.put(('checkShutdownVariable', 'no data')) for thread in threading.enumerate(): - if thread.isAlive() and isinstance(thread, StoppableThread): + try: + alive = thread.isAlive() + except AttributeError: + alive = thread.is_alive() + if alive and isinstance(thread, StoppableThread): thread.stopThread() UISignalQueue.put((