diff options
| author | Micah Lee <micah@micahflee.com> | 2020-12-13 11:40:25 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2020-12-13 11:40:25 -0800 |
| commit | b96b83905ba5b62c332a6c8946218ddae4c61517 (patch) | |
| tree | f5a8fb5ade60583e12d07c657fde007c8ffe4ce0 /desktop/src/onionshare/threads.py | |
| parent | ae621b4001dc44d7f07a9fad43376439b855ccd8 (diff) | |
| parent | a520057bf4bd0956f03b763bfacdb8145cb5f977 (diff) | |
| download | onionshare-b96b83905ba5b62c332a6c8946218ddae4c61517.tar.gz onionshare-b96b83905ba5b62c332a6c8946218ddae4c61517.zip | |
Merge branch 'develop' into 929_download_errors
Diffstat (limited to 'desktop/src/onionshare/threads.py')
| -rw-r--r-- | desktop/src/onionshare/threads.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/desktop/src/onionshare/threads.py b/desktop/src/onionshare/threads.py index 22e264e5..0c31a838 100644 --- a/desktop/src/onionshare/threads.py +++ b/desktop/src/onionshare/threads.py @@ -24,7 +24,6 @@ import os from PySide2 import QtCore from onionshare_cli.onion import ( - TorTooOld, TorErrorInvalidSetting, TorErrorAutomatic, TorErrorSocketPort, @@ -34,6 +33,10 @@ from onionshare_cli.onion import ( TorErrorAuthError, TorErrorProtocolError, BundledTorTimeout, + BundledTorBroken, + TorTooOldEphemeral, + TorTooOldStealth, + PortNotAvailable, ) from . import strings @@ -93,7 +96,6 @@ class OnionThread(QtCore.QThread): self.success.emit() except ( - TorTooOld, TorErrorInvalidSetting, TorErrorAutomatic, TorErrorSocketPort, @@ -103,9 +105,13 @@ class OnionThread(QtCore.QThread): TorErrorAuthError, TorErrorProtocolError, BundledTorTimeout, - OSError, + BundledTorBroken, + TorTooOldEphemeral, + TorTooOldStealth, + PortNotAvailable, ) as e: - self.error.emit(e.args[0]) + message = self.mode.common.gui.get_translated_tor_error(e) + self.error.emit(message) return |