summaryrefslogtreecommitdiff
path: root/desktop/src/onionshare/threads.py
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2021-08-20 14:43:21 -0700
committerGitHub <noreply@github.com>2021-08-20 14:43:21 -0700
commitb66e742bc20ae977232fc53f22d485c10173ac2f (patch)
treec6eb66c340c34b45bac5525350c5eb5c43fe33a6 /desktop/src/onionshare/threads.py
parent76104671c3eacbef53ad96fffd8a57512ab2d093 (diff)
parent02254b13bb4818745193092f2144fd83726d79e7 (diff)
downloadonionshare-b66e742bc20ae977232fc53f22d485c10173ac2f.tar.gz
onionshare-b66e742bc20ae977232fc53f22d485c10173ac2f.zip
Merge pull request #1395 from onionshare/developv2.3.3
Version 2.3.3, merge develop into stable
Diffstat (limited to 'desktop/src/onionshare/threads.py')
-rw-r--r--desktop/src/onionshare/threads.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/src/onionshare/threads.py b/desktop/src/onionshare/threads.py
index 214344f7..c9a3dba4 100644
--- a/desktop/src/onionshare/threads.py
+++ b/desktop/src/onionshare/threads.py
@@ -158,14 +158,14 @@ class AutoStartTimer(QtCore.QThread):
)
try:
# Sleep until scheduled time
- while autostart_timer_datetime_delta > 0 and self.canceled == False:
+ while autostart_timer_datetime_delta > 0 and self.canceled is False:
time.sleep(0.1)
now = QtCore.QDateTime.currentDateTime()
autostart_timer_datetime_delta = now.secsTo(
self.mode.server_status.autostart_timer_datetime
)
# Timer has now finished
- if self.canceled == False:
+ if self.canceled is False:
self.mode.server_status.server_button.setText(
strings._("gui_please_wait")
)
@@ -252,7 +252,7 @@ class EventHandlerThread(QtCore.QThread):
"EventHandler", "run", f"invalid event type: {obj}"
)
- except:
+ except Exception:
pass
if self.should_quit: