diff options
Diffstat (limited to 'cli')
-rw-r--r-- | cli/onionshare_cli/__init__.py | 9 | ||||
-rw-r--r-- | cli/onionshare_cli/common.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/mode_settings.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/onion.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/onionshare.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/resources/version.txt | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/settings.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/web/__init__.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/web/chat_mode.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/web/receive_mode.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/web/send_base_mode.py | 6 | ||||
-rw-r--r-- | cli/onionshare_cli/web/share_mode.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/web/web.py | 2 | ||||
-rw-r--r-- | cli/onionshare_cli/web/website_mode.py | 2 | ||||
-rw-r--r-- | cli/pyproject.toml | 2 | ||||
-rw-r--r-- | cli/setup.py | 4 |
16 files changed, 24 insertions, 21 deletions
diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 72212760..092e716a 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -293,7 +293,11 @@ def main(cwd=None): if mode == "share" or mode == "website": # Unless you passed in a persistent filename, in which case get the filenames from # the mode settings - if persistent_filename and not mode_settings.just_created and len(filenames) != 0: + if ( + persistent_filename + and not mode_settings.just_created + and len(filenames) != 0 + ): filenames = mode_settings.get(mode, "filenames") else: @@ -321,7 +325,6 @@ def main(cwd=None): if persistent_filename: mode_settings.set(mode, "filenames", filenames) - # Create the Web object web = Web(common, False, mode_settings, mode) diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index e8b174b6..6e36dbd6 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/mode_settings.py b/cli/onionshare_cli/mode_settings.py index 4e3a27ab..4f105653 100644 --- a/cli/onionshare_cli/mode_settings.py +++ b/cli/onionshare_cli/mode_settings.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py index 7c9d0a67..aab2e1ff 100644 --- a/cli/onionshare_cli/onion.py +++ b/cli/onionshare_cli/onion.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/onionshare.py b/cli/onionshare_cli/onionshare.py index db15a03d..30eae3f3 100644 --- a/cli/onionshare_cli/onionshare.py +++ b/cli/onionshare_cli/onionshare.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/resources/version.txt b/cli/onionshare_cli/resources/version.txt index c0943d3e..a6254504 100644 --- a/cli/onionshare_cli/resources/version.txt +++ b/cli/onionshare_cli/resources/version.txt @@ -1 +1 @@ -2.3
\ No newline at end of file +2.3.1
\ No newline at end of file diff --git a/cli/onionshare_cli/settings.py b/cli/onionshare_cli/settings.py index 00dde00c..a655d46c 100644 --- a/cli/onionshare_cli/settings.py +++ b/cli/onionshare_cli/settings.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/__init__.py b/cli/onionshare_cli/web/__init__.py index f036d011..3c7f4a51 100644 --- a/cli/onionshare_cli/web/__init__.py +++ b/cli/onionshare_cli/web/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/chat_mode.py b/cli/onionshare_cli/web/chat_mode.py index 03843ee8..d4c57438 100644 --- a/cli/onionshare_cli/web/chat_mode.py +++ b/cli/onionshare_cli/web/chat_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/receive_mode.py b/cli/onionshare_cli/web/receive_mode.py index a0da0d3c..62415578 100644 --- a/cli/onionshare_cli/web/receive_mode.py +++ b/cli/onionshare_cli/web/receive_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/send_base_mode.py b/cli/onionshare_cli/web/send_base_mode.py index ad4459fe..b09fc4c6 100644 --- a/cli/onionshare_cli/web/send_base_mode.py +++ b/cli/onionshare_cli/web/send_base_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -265,8 +265,8 @@ class SendBaseModeWeb: r.headers.set("Content-Encoding", "gzip") r.headers.set("Content-Length", filesize) filename_dict = { - 'filename': unidecode(basename), - 'filename*': "UTF-8''%s" % url_quote(basename) + "filename": unidecode(basename), + "filename*": "UTF-8''%s" % url_quote(basename), } r.headers.set("Content-Disposition", "inline", **filename_dict) r = self.web.add_security_headers(r) diff --git a/cli/onionshare_cli/web/share_mode.py b/cli/onionshare_cli/web/share_mode.py index 821f4978..72ba8c64 100644 --- a/cli/onionshare_cli/web/share_mode.py +++ b/cli/onionshare_cli/web/share_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/web.py b/cli/onionshare_cli/web/web.py index 010df3eb..6f4986e7 100644 --- a/cli/onionshare_cli/web/web.py +++ b/cli/onionshare_cli/web/web.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/website_mode.py b/cli/onionshare_cli/web/website_mode.py index 352f4f3c..fa8b53bd 100644 --- a/cli/onionshare_cli/web/website_mode.py +++ b/cli/onionshare_cli/web/website_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/pyproject.toml b/cli/pyproject.toml index 2843d0bb..e393a8c5 100644 --- a/cli/pyproject.toml +++ b/cli/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "onionshare_cli" -version = "2.3" +version = "2.3.1" 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." authors = ["Micah Lee <micah@micahflee.com>"] license = "GPLv3+" diff --git a/cli/setup.py b/cli/setup.py index fa597408..90f7ddbc 100644 --- a/cli/setup.py +++ b/cli/setup.py @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. import os import setuptools -version = "2.3" +version = "2.3.1" setuptools.setup( name="onionshare-cli", |