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(

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

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((