diff options
author | Micah Lee <micah@micahflee.com> | 2021-04-11 11:37:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-11 11:37:42 -0700 |
commit | a08a12d855f96bff727175a5c528d27dc41f1a75 (patch) | |
tree | c72ee4df4dfbeee810d70ede5f8b57fe3a0b0eeb /cli/onionshare_cli | |
parent | eb51b138cbcd9a85f5cbe8753c10a3b0495fa424 (diff) | |
parent | ea8d2cfdfe3834e1dbb0ef0e12beb7da41a033f2 (diff) | |
download | onionshare-a08a12d855f96bff727175a5c528d27dc41f1a75.tar.gz onionshare-a08a12d855f96bff727175a5c528d27dc41f1a75.zip |
Merge pull request #1317 from akshgpt7/chore-refactor-issues
Refactor code quality issues
Diffstat (limited to 'cli/onionshare_cli')
-rw-r--r-- | cli/onionshare_cli/__init__.py | 3 | ||||
-rw-r--r-- | cli/onionshare_cli/common.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/onion.py | 20 | ||||
-rw-r--r-- | cli/onionshare_cli/onionshare.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/settings.py | 1 | ||||
-rw-r--r-- | cli/onionshare_cli/web/chat_mode.py | 6 | ||||
-rw-r--r-- | cli/onionshare_cli/web/send_base_mode.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/web/web.py | 6 | ||||
-rw-r--r-- | cli/onionshare_cli/web/website_mode.py | 5 |
9 files changed, 11 insertions, 36 deletions
diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 0f361b00..c40bf6a0 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -514,8 +514,7 @@ def main(cwd=None): print("Stopped because auto-stop timer ran out") web.stop(app.port) break - else: - web.receive_mode.can_upload = False + web.receive_mode.can_upload = False # Allow KeyboardInterrupt exception to be handled with threads # https://stackoverflow.com/questions/3788208/python-threading-ignores-keyboardinterrupt-exception time.sleep(0.2) diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index 6e36dbd6..4cfe83ae 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -19,13 +19,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ import base64 import hashlib -import inspect import os import platform import random import socket import sys -import tempfile import threading import time import shutil diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py index 3812e0e4..000d9308 100644 --- a/cli/onionshare_cli/onion.py +++ b/cli/onionshare_cli/onion.py @@ -28,11 +28,9 @@ import tempfile import subprocess import time import shlex -import getpass import psutil from distutils.version import LooseVersion as Version -from .settings import Settings class TorErrorAutomatic(Exception): @@ -518,13 +516,12 @@ class Onion(object): self.settings.get("control_port_address"), self.settings.get("control_port_port"), ) - else: - print( - "Can't connect to the Tor controller using socket file {}.".format( - self.settings.get("socket_file_path") - ) + print( + "Can't connect to the Tor controller using socket file {}.".format( + self.settings.get("socket_file_path") ) - raise TorErrorSocketFile(self.settings.get("socket_file_path")) + ) + raise TorErrorSocketFile(self.settings.get("socket_file_path")) # Try authenticating try: @@ -755,7 +752,7 @@ class Onion(object): ): rendezvous_circuit_ids.append(c.id) - symbols = [c for c in "\\|/-"] + symbols = list("\\|/-") symbols_i = 0 while True: @@ -837,9 +834,6 @@ class Onion(object): # Import the key key = RSA.importKey(base64.b64decode(key)) # Is this a v2 Onion key? (1024 bits) If so, we should keep using it. - if key.n.bit_length() == 1024: - return True - else: - return False + return key.n.bit_length() == 1024 except: return False diff --git a/cli/onionshare_cli/onionshare.py b/cli/onionshare_cli/onionshare.py index 30eae3f3..4e34cf4b 100644 --- a/cli/onionshare_cli/onionshare.py +++ b/cli/onionshare_cli/onionshare.py @@ -19,8 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ import os, shutil - -from . import common from .common import AutoStopTimer diff --git a/cli/onionshare_cli/settings.py b/cli/onionshare_cli/settings.py index a655d46c..00e3e79b 100644 --- a/cli/onionshare_cli/settings.py +++ b/cli/onionshare_cli/settings.py @@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. import json import os -import platform import locale try: diff --git a/cli/onionshare_cli/web/chat_mode.py b/cli/onionshare_cli/web/chat_mode.py index d4c57438..2daf9654 100644 --- a/cli/onionshare_cli/web/chat_mode.py +++ b/cli/onionshare_cli/web/chat_mode.py @@ -19,15 +19,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ from flask import ( - Request, request, render_template, make_response, jsonify, - redirect, - session, -) -from werkzeug.utils import secure_filename + session) from flask_socketio import emit, join_room, leave_room diff --git a/cli/onionshare_cli/web/send_base_mode.py b/cli/onionshare_cli/web/send_base_mode.py index b09fc4c6..b42c346b 100644 --- a/cli/onionshare_cli/web/send_base_mode.py +++ b/cli/onionshare_cli/web/send_base_mode.py @@ -23,7 +23,7 @@ import sys import tempfile import mimetypes import gzip -from flask import Response, request, render_template, make_response +from flask import Response, request from unidecode import unidecode from werkzeug.urls import url_quote diff --git a/cli/onionshare_cli/web/web.py b/cli/onionshare_cli/web/web.py index 6f4986e7..7408046b 100644 --- a/cli/onionshare_cli/web/web.py +++ b/cli/onionshare_cli/web/web.py @@ -17,17 +17,11 @@ GNU General Public License for more details. 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 hmac import logging import os import queue -import socket -import sys -import tempfile import requests from distutils.version import LooseVersion as Version -from urllib.request import urlopen import flask from flask import ( diff --git a/cli/onionshare_cli/web/website_mode.py b/cli/onionshare_cli/web/website_mode.py index fa8b53bd..5718c9a9 100644 --- a/cli/onionshare_cli/web/website_mode.py +++ b/cli/onionshare_cli/web/website_mode.py @@ -19,10 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ import os -import sys -import tempfile -import mimetypes -from flask import Response, request, render_template, make_response +from flask import render_template, make_response from .send_base_mode import SendBaseModeWeb |