diff options
author | Micah Lee <micah@micahflee.com> | 2021-04-30 11:38:23 -0700 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2021-04-30 11:38:23 -0700 |
commit | b51c0ee046b00cc99d8e0cdc147039521c815be4 (patch) | |
tree | df6ade75d3053482b488efdda0dcac18adfc3974 /desktop/src | |
parent | 0a6056e5e6d6e29c2c2bd412ecf02ee9a2a4a8de (diff) | |
download | onionshare-b51c0ee046b00cc99d8e0cdc147039521c815be4.tar.gz onionshare-b51c0ee046b00cc99d8e0cdc147039521c815be4.zip |
Fix flake8 warnings in desktop
Diffstat (limited to 'desktop/src')
-rw-r--r-- | desktop/src/onionshare/__init__.py | 1 | ||||
-rw-r--r-- | desktop/src/onionshare/tab/mode/__init__.py | 4 | ||||
-rw-r--r-- | desktop/src/onionshare/tab/mode/chat_mode/__init__.py | 6 | ||||
-rw-r--r-- | desktop/src/onionshare/tab/mode/history.py | 2 | ||||
-rw-r--r-- | desktop/src/onionshare/tab/mode/mode_settings_widget.py | 2 | ||||
-rw-r--r-- | desktop/src/onionshare/tab/mode/share_mode/__init__.py | 3 | ||||
-rw-r--r-- | desktop/src/onionshare/tab/mode/share_mode/threads.py | 2 | ||||
-rw-r--r-- | desktop/src/onionshare/tab/mode/website_mode/__init__.py | 5 | ||||
-rw-r--r-- | desktop/src/onionshare/tab/server_status.py | 2 | ||||
-rw-r--r-- | desktop/src/onionshare/threads.py | 2 | ||||
-rw-r--r-- | desktop/src/onionshare/tor_connection_dialog.py | 2 | ||||
-rw-r--r-- | desktop/src/onionshare/update_checker.py | 3 | ||||
-rw-r--r-- | desktop/src/setup.py | 7 |
13 files changed, 18 insertions, 23 deletions
diff --git a/desktop/src/onionshare/__init__.py b/desktop/src/onionshare/__init__.py index 1c69ffa5..8276dae4 100644 --- a/desktop/src/onionshare/__init__.py +++ b/desktop/src/onionshare/__init__.py @@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. from __future__ import division import os import sys -import platform import argparse import signal import json diff --git a/desktop/src/onionshare/tab/mode/__init__.py b/desktop/src/onionshare/tab/mode/__init__.py index 9cd8fe81..fe7d6615 100644 --- a/desktop/src/onionshare/tab/mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/__init__.py @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. """ -from PySide2 import QtCore, QtWidgets, QtGui +from PySide2 import QtCore, QtWidgets from onionshare_cli.common import AutoStopTimer @@ -379,7 +379,7 @@ class Mode(QtWidgets.QWidget): if self.server_status.status != ServerStatus.STATUS_STOPPED: try: self.web.stop(self.app.port) - except: + except Exception: # Probably we had no port to begin with (Onion service didn't start) pass self.app.cleanup() diff --git a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py index 44a6d240..7f32aebb 100644 --- a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py @@ -18,14 +18,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. """ -import os -import random -import string - from PySide2 import QtCore, QtWidgets, QtGui -from onionshare_cli.onion import * -from onionshare_cli.common import Common from onionshare_cli.web import Web from .. import Mode diff --git a/desktop/src/onionshare/tab/mode/history.py b/desktop/src/onionshare/tab/mode/history.py index 45e37c75..10606c85 100644 --- a/desktop/src/onionshare/tab/mode/history.py +++ b/desktop/src/onionshare/tab/mode/history.py @@ -253,7 +253,7 @@ class ReceiveHistoryItemFile(QtWidgets.QWidget): try: # If nautilus is available, open it subprocess.Popen(["xdg-open", self.dir]) - except: + except Exception: Alert( self.common, strings._("gui_open_folder_error").format(abs_filename), diff --git a/desktop/src/onionshare/tab/mode/mode_settings_widget.py b/desktop/src/onionshare/tab/mode/mode_settings_widget.py index ef59f37e..98a6a01a 100644 --- a/desktop/src/onionshare/tab/mode/mode_settings_widget.py +++ b/desktop/src/onionshare/tab/mode/mode_settings_widget.py @@ -234,7 +234,7 @@ class ModeSettingsWidget(QtWidgets.QWidget): self.tab.change_title.emit( self.tab.tab_id, strings._("gui_tab_name_chat") ) - elif self.tab_mode == None: + elif self.tab_mode is None: pass else: title = self.title_lineedit.text() diff --git a/desktop/src/onionshare/tab/mode/share_mode/__init__.py b/desktop/src/onionshare/tab/mode/share_mode/__init__.py index 05038e20..676d34af 100644 --- a/desktop/src/onionshare/tab/mode/share_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/share_mode/__init__.py @@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. import os from PySide2 import QtCore, QtWidgets, QtGui -from onionshare_cli.onion import * from onionshare_cli.common import Common from onionshare_cli.web import Web @@ -30,7 +29,7 @@ from .. import Mode from ..file_selection import FileSelection from ..history import History, ToggleHistory, ShareHistoryItem from .... import strings -from ....widgets import Alert, MinimumWidthWidget +from ....widgets import MinimumWidthWidget from ....gui_common import GuiCommon diff --git a/desktop/src/onionshare/tab/mode/share_mode/threads.py b/desktop/src/onionshare/tab/mode/share_mode/threads.py index 6f5c44ea..74d5099a 100644 --- a/desktop/src/onionshare/tab/mode/share_mode/threads.py +++ b/desktop/src/onionshare/tab/mode/share_mode/threads.py @@ -36,7 +36,7 @@ class CompressThread(QtCore.QThread): # prepare files to share def set_processed_size(self, x): - if self.mode._zip_progress_bar != None: + if self.mode._zip_progress_bar is not None: self.mode._zip_progress_bar.update_processed_size_signal.emit(x) def run(self): diff --git a/desktop/src/onionshare/tab/mode/website_mode/__init__.py b/desktop/src/onionshare/tab/mode/website_mode/__init__.py index f7cfa758..10caff51 100644 --- a/desktop/src/onionshare/tab/mode/website_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/website_mode/__init__.py @@ -19,12 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ import os -import random -import string from PySide2 import QtCore, QtWidgets, QtGui -from onionshare_cli.onion import * from onionshare_cli.common import Common from onionshare_cli.web import Web @@ -32,7 +29,7 @@ from .. import Mode from ..file_selection import FileSelection from ..history import History, ToggleHistory from .... import strings -from ....widgets import Alert, MinimumWidthWidget +from ....widgets import MinimumWidthWidget from ....gui_common import GuiCommon diff --git a/desktop/src/onionshare/tab/server_status.py b/desktop/src/onionshare/tab/server_status.py index d8266820..7ca1af09 100644 --- a/desktop/src/onionshare/tab/server_status.py +++ b/desktop/src/onionshare/tab/server_status.py @@ -161,7 +161,7 @@ class ServerStatus(QtWidgets.QWidget): self.url.setText(wrapped_onion_url) else: self.url.setText(self.get_url()) - except: + except Exception: pass def show_url(self): diff --git a/desktop/src/onionshare/threads.py b/desktop/src/onionshare/threads.py index 504591f6..c9a3dba4 100644 --- a/desktop/src/onionshare/threads.py +++ b/desktop/src/onionshare/threads.py @@ -252,7 +252,7 @@ class EventHandlerThread(QtCore.QThread): "EventHandler", "run", f"invalid event type: {obj}" ) - except: + except Exception: pass if self.should_quit: diff --git a/desktop/src/onionshare/tor_connection_dialog.py b/desktop/src/onionshare/tor_connection_dialog.py index c3644f8b..b5c2f61c 100644 --- a/desktop/src/onionshare/tor_connection_dialog.py +++ b/desktop/src/onionshare/tor_connection_dialog.py @@ -166,7 +166,7 @@ class TorConnectionThread(QtCore.QThread): else: self.canceled_connecting_to_tor.emit() - except BundledTorCanceled as e: + except BundledTorCanceled: self.common.log( "TorConnectionThread", "run", "caught exception: BundledTorCanceled" ) diff --git a/desktop/src/onionshare/update_checker.py b/desktop/src/onionshare/update_checker.py index 43c83828..08755e6e 100644 --- a/desktop/src/onionshare/update_checker.py +++ b/desktop/src/onionshare/update_checker.py @@ -19,7 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ from PySide2 import QtCore -import datetime, re +import datetime +import re import socks from distutils.version import LooseVersion as Version diff --git a/desktop/src/setup.py b/desktop/src/setup.py index c2c91d28..82a5f98a 100644 --- a/desktop/src/setup.py +++ b/desktop/src/setup.py @@ -25,7 +25,12 @@ version = "2.3.1" setuptools.setup( name="onionshare", version=version, - description="OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service.", + description=( + "OnionShare lets you securely and anonymously send and receive files. It works by starting a web " + "server, making it accessible as a Tor onion service, and generating an unguessable web address so " + "others can download files from you, or upload files to you. It does _not_ require setting up a " + "separate server or using a third party file-sharing service." + ), author="Micah Lee", author_email="micah@micahflee.com", maintainer="Micah Lee", |