diff options
author | Miguel Jacq <mig@mig5.net> | 2021-10-18 17:17:47 +1100 |
---|---|---|
committer | Miguel Jacq <mig@mig5.net> | 2021-10-18 17:17:47 +1100 |
commit | 0989f2b133a46f293a65c9e11a01e8a097e479a1 (patch) | |
tree | 26dcc2d37b87220af2722656fc0f19cc1169ee20 /cli/onionshare_cli/__init__.py | |
parent | c9fa2308a7c9fb99b40d1c7b8c112c5b9f510d75 (diff) | |
download | onionshare-0989f2b133a46f293a65c9e11a01e8a097e479a1.tar.gz onionshare-0989f2b133a46f293a65c9e11a01e8a097e479a1.zip |
Move Censorship stuff into its own class. Early attempt at subprocessing out to meek (unfinished)
Diffstat (limited to 'cli/onionshare_cli/__init__.py')
-rw-r--r-- | cli/onionshare_cli/__init__.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 4bc00929..ddba332e 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -27,13 +27,9 @@ from datetime import datetime from datetime import timedelta from .common import Common, CannotFindTor +from .censorship import CensorshipCircumvention from .web import Web -from .onion import ( - TorErrorProtocolError, - TorTooOldEphemeral, - TorTooOldStealth, - Onion, -) +from .onion import TorErrorProtocolError, TorTooOldEphemeral, TorTooOldStealth, Onion from .onionshare import OnionShare from .mode_settings import ModeSettings @@ -94,12 +90,7 @@ def main(cwd=None): help="Filename of persistent session", ) # General args - parser.add_argument( - "--title", - metavar="TITLE", - default=None, - help="Set a title", - ) + parser.add_argument("--title", metavar="TITLE", default=None, help="Set a title") parser.add_argument( "--public", action="store_true", @@ -409,7 +400,7 @@ def main(cwd=None): sys.exit(1) # Warn about sending large files over Tor - if web.share_mode.download_filesize >= 157286400: # 150mb + if web.share_mode.download_filesize >= 157_286_400: # 150mb print("") print("Warning: Sending a large share could take hours") print("") |