diff options
| author | Micah Lee <micah@micahflee.com> | 2020-08-27 19:13:08 -0400 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2020-08-27 19:13:08 -0400 |
| commit | 4c4323a772c56c6fc38ed5ec99868ba2ce82285d (patch) | |
| tree | 4679af536b2ee057f67123c36814427175b7924b | |
| parent | dc6cefd7ce0d732667163273871a0b93ce62ea3b (diff) | |
| download | onionshare-4c4323a772c56c6fc38ed5ec99868ba2ce82285d.tar.gz onionshare-4c4323a772c56c6fc38ed5ec99868ba2ce82285d.zip | |
Update Copyright to 2020 everywhere, and assign to Micah Lee, et al. instead of just Micah Lee
50 files changed, 239 insertions, 158 deletions
@@ -1,7 +1,7 @@ (Note: Third-party licenses can be found under install/licenses/.) OnionShare -Copyright © 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/dev_scripts/onionshare b/dev_scripts/onionshare index 29cdedcc..33e59203 100755 --- a/dev_scripts/onionshare +++ b/dev_scripts/onionshare @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -21,8 +21,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # Load onionshare module and resources from the source code tree import os, sys + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.onionshare_dev_mode = True import onionshare + onionshare.main() diff --git a/dev_scripts/onionshare-gui b/dev_scripts/onionshare-gui index 40ab742c..6585be02 100755 --- a/dev_scripts/onionshare-gui +++ b/dev_scripts/onionshare-gui @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -21,8 +21,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # Load onionshare module and resources from the source code tree import os, sys + sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) sys.onionshare_dev_mode = True import onionshare_gui + onionshare_gui.main() diff --git a/install/get-tor-osx.py b/install/get-tor-osx.py index c68a81a6..073384d7 100644 --- a/install/get-tor-osx.py +++ b/install/get-tor-osx.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/install/get-tor-windows.py b/install/get-tor-windows.py index 99608706..07811880 100644 --- a/install/get-tor-windows.py +++ b/install/get-tor-windows.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/install/org.onionshare.OnionShare.appdata.xml b/install/org.onionshare.OnionShare.appdata.xml index 3ba2a51a..9fecb922 100644 --- a/install/org.onionshare.OnionShare.appdata.xml +++ b/install/org.onionshare.OnionShare.appdata.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2018 Micah Lee <micah@micahflee.com> --> <component type="desktop-application"> <id>org.onionshare.OnionShare</id> <metadata_license>CC0-1.0</metadata_license> diff --git a/install/scripts/onionshare b/install/scripts/onionshare index e2205e04..67298b6f 100755 --- a/install/scripts/onionshare +++ b/install/scripts/onionshare @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -19,4 +19,5 @@ 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 onionshare + onionshare.main() diff --git a/install/scripts/onionshare-gui b/install/scripts/onionshare-gui index fed29d83..f1d36a86 100755 --- a/install/scripts/onionshare-gui +++ b/install/scripts/onionshare-gui @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -19,4 +19,5 @@ 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 onionshare_gui + onionshare_gui.main() diff --git a/install/scripts/onionshare-pyinstaller b/install/scripts/onionshare-pyinstaller index bd59b421..8ca791aa 100644 --- a/install/scripts/onionshare-pyinstaller +++ b/install/scripts/onionshare-pyinstaller @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -22,16 +22,18 @@ import sys, os, platform # In macOS, allow both CLI and GUI depending on the filename of the binary # being executed -if platform.system() == 'Darwin': +if platform.system() == "Darwin": # If the binary being executed is called 'onionshare', use CLI basename = os.path.basename(sys.argv[0]) - if basename == 'onionshare': + if basename == "onionshare": import onionshare + onionshare.main() # Otherwise, use GUI else: import onionshare_gui + onionshare_gui.main() # Unfortunately this trick won't work in Windows because I want to set @@ -41,4 +43,5 @@ if platform.system() == 'Darwin': # https://pyinstaller.readthedocs.io/en/stable/spec-files.html#multipackage-bundles else: import onionshare_gui + onionshare_gui.main() diff --git a/onionshare/__init__.py b/onionshare/__init__.py index 9946a700..c1367b1e 100644 --- a/onionshare/__init__.py +++ b/onionshare/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -46,25 +46,49 @@ def main(cwd=None): # Display OnionShare banner print(f"OnionShare {common.version} | https://onionshare.org/") - reset='\033[0m' - purple='\33[95m' + reset = "\033[0m" + purple = "\33[95m" print(purple) print(" @@@@@@@@@ ") print(" @@@@@@@@@@@@@@@@@@@ ") print(" @@@@@@@@@@@@@@@@@@@@@@@@@ ") print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ___ _ ") - print(" @@@@@@ @@@@@@@@@@@@@ / _ \ (_) ") - print(" @@@@ @ @@@@@@@@@@@ | | | |_ __ _ ___ _ __ ") - print(" @@@@@@@@ @@@@@@@@@@ | | | | '_ \| |/ _ \| '_ \ ") - print(" @@@@@@@@@@@@ @@@@@@@@@@ \ \_/ / | | | | (_) | | | | ") - print(" @@@@@@@@@@@@@@@@ @@@@@@@@@ \___/|_| |_|_|\___/|_| |_| ") - print(" @@@@@@@@@ @@@@@@@@@@@@@@@@ _____ _ ") - print(" @@@@@@@@@@ @@@@@@@@@@@@ / ___| | ") - print(" @@@@@@@@@@ @@@@@@@@ \ `--.| |__ __ _ _ __ ___ ") - print(" @@@@@@@@@@@ @ @@@@ `--. \ '_ \ / _` | '__/ _ \\") - print(" @@@@@@@@@@@@@ @@@@@@ /\__/ / | | | (_| | | | __/") - print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \____/|_| |_|\__,_|_| \___|") + print( + " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ___ _ " + ) + print( + " @@@@@@ @@@@@@@@@@@@@ / _ \ (_) " + ) + print( + " @@@@ @ @@@@@@@@@@@ | | | |_ __ _ ___ _ __ " + ) + print( + " @@@@@@@@ @@@@@@@@@@ | | | | '_ \| |/ _ \| '_ \ " + ) + print( + " @@@@@@@@@@@@ @@@@@@@@@@ \ \_/ / | | | | (_) | | | | " + ) + print( + " @@@@@@@@@@@@@@@@ @@@@@@@@@ \___/|_| |_|_|\___/|_| |_| " + ) + print( + " @@@@@@@@@ @@@@@@@@@@@@@@@@ _____ _ " + ) + print( + " @@@@@@@@@@ @@@@@@@@@@@@ / ___| | " + ) + print( + " @@@@@@@@@@ @@@@@@@@ \ `--.| |__ __ _ _ __ ___ " + ) + print( + " @@@@@@@@@@@ @ @@@@ `--. \ '_ \ / _` | '__/ _ \\" + ) + print( + " @@@@@@@@@@@@@ @@@@@@ /\__/ / | | | (_| | | | __/" + ) + print( + " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ \____/|_| |_|\__,_|_| \___|" + ) print(" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ") print(" @@@@@@@@@@@@@@@@@@@@@@@@@ ") print(" @@@@@@@@@@@@@@@@@@@ ") diff --git a/onionshare/common.py b/onionshare/common.py index 18e4841d..27104669 100644 --- a/onionshare/common.py +++ b/onionshare/common.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/onionshare/mode_settings.py b/onionshare/mode_settings.py index 8216c1d8..19bca58f 100644 --- a/onionshare/mode_settings.py +++ b/onionshare/mode_settings.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/onionshare/onion.py b/onionshare/onion.py index 88d72496..0b300e4d 100644 --- a/onionshare/onion.py +++ b/onionshare/onion.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/onionshare/onionshare.py b/onionshare/onionshare.py index 0fa25767..25c8ad90 100644 --- a/onionshare/onionshare.py +++ b/onionshare/onionshare.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/onionshare/settings.py b/onionshare/settings.py index f9348a8e..76178d29 100644 --- a/onionshare/settings.py +++ b/onionshare/settings.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/onionshare/strings.py b/onionshare/strings.py index 0ea2ba24..7e1756e3 100644 --- a/onionshare/strings.py +++ b/onionshare/strings.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/onionshare/web/__init__.py b/onionshare/web/__init__.py index d45b4983..f036d011 100644 --- a/onionshare/web/__init__.py +++ b/onionshare/web/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/onionshare/web/chat_mode.py b/onionshare/web/chat_mode.py index f06bdea8..15e236d3 100644 --- a/onionshare/web/chat_mode.py +++ b/onionshare/web/chat_mode.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +""" +OnionShare | https://onionshare.org/ + +Copyright (C) 2014-2020 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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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/>. +""" + from flask import ( Request, request, diff --git a/onionshare/web/receive_mode.py b/onionshare/web/receive_mode.py index 17613fdd..a9876c40 100644 --- a/onionshare/web/receive_mode.py +++ b/onionshare/web/receive_mode.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +""" +OnionShare | https://onionshare.org/ + +Copyright (C) 2014-2020 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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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 os import tempfile import json diff --git a/onionshare/web/send_base_mode.py b/onionshare/web/send_base_mode.py index 020b65e0..9d5f876b 100644 --- a/onionshare/web/send_base_mode.py +++ b/onionshare/web/send_base_mode.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +""" +OnionShare | https://onionshare.org/ + +Copyright (C) 2014-2020 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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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 os import sys import tempfile diff --git a/onionshare/web/share_mode.py b/onionshare/web/share_mode.py index 16a16a0b..ccd29e1c 100644 --- a/onionshare/web/share_mode.py +++ b/onionshare/web/share_mode.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +""" +OnionShare | https://onionshare.org/ + +Copyright (C) 2014-2020 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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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 os import sys import tempfile diff --git a/onionshare/web/web.py b/onionshare/web/web.py index 3a22c789..117ea83a 100644 --- a/onionshare/web/web.py +++ b/onionshare/web/web.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +""" +OnionShare | https://onionshare.org/ + +Copyright (C) 2014-2020 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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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 diff --git a/onionshare/web/website_mode.py b/onionshare/web/website_mode.py index 61b6d2c6..2838fc05 100644 --- a/onionshare/web/website_mode.py +++ b/onionshare/web/website_mode.py @@ -1,3 +1,23 @@ +# -*- coding: utf-8 -*- +""" +OnionShare | https://onionshare.org/ + +Copyright (C) 2014-2020 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 +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +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 os import sys import tempfile diff --git a/onionshare_gui/__init__.py b/onionshare_gui/__init__.py index c2605e81..070d03a4 100644 --- a/onionshare_gui/__init__.py +++ b/onionshare_gui/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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/>. """ + from __future__ import division import os import sys diff --git a/onionshare_gui/gui_common.py b/onionshare_gui/gui_common.py index f6d3eedf..509e67fd 100644 --- a/onionshare_gui/gui_common.py +++ b/onionshare_gui/gui_common.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 os from onionshare import strings diff --git a/onionshare_gui/main_window.py b/onionshare_gui/main_window.py index 1c745b1c..6bd84b8a 100644 --- a/onionshare_gui/main_window.py +++ b/onionshare_gui/main_window.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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/>. """ + from PyQt5 import QtCore, QtWidgets, QtGui from onionshare import strings diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py index 46057905..dd711e59 100644 --- a/onionshare_gui/settings_dialog.py +++ b/onionshare_gui/settings_dialog.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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/>. """ + from PyQt5 import QtCore, QtWidgets, QtGui import sys import platform diff --git a/onionshare_gui/tab/__init__.py b/onionshare_gui/tab/__init__.py index ca346a7d..162d13aa 100644 --- a/onionshare_gui/tab/__init__.py +++ b/onionshare_gui/tab/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,4 +17,5 @@ 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/>. """ + from .tab import Tab diff --git a/onionshare_gui/tab/mode/__init__.py b/onionshare_gui/tab/mode/__init__.py index a527ef0c..984e6573 100644 --- a/onionshare_gui/tab/mode/__init__.py +++ b/onionshare_gui/tab/mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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/>. """ + from PyQt5 import QtCore, QtWidgets, QtGui from onionshare import strings diff --git a/onionshare_gui/tab/mode/chat_mode/__init__.py b/onionshare_gui/tab/mode/chat_mode/__init__.py index d255fcbd..8b1fb142 100644 --- a/onionshare_gui/tab/mode/chat_mode/__init__.py +++ b/onionshare_gui/tab/mode/chat_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 os import random import string diff --git a/onionshare_gui/tab/mode/file_selection.py b/onionshare_gui/tab/mode/file_selection.py index bcff07cb..a3212c96 100644 --- a/onionshare_gui/tab/mode/file_selection.py +++ b/onionshare_gui/tab/mode/file_selection.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 os from PyQt5 import QtCore, QtWidgets, QtGui diff --git a/onionshare_gui/tab/mode/history.py b/onionshare_gui/tab/mode/history.py index c1a2d54d..feb671ef 100644 --- a/onionshare_gui/tab/mode/history.py +++ b/onionshare_gui/tab/mode/history.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 time import subprocess import os @@ -463,7 +464,7 @@ class IndividualFileHistoryItem(HistoryItem): self.downloaded_bytes = downloaded_bytes self.progress_bar.setValue(downloaded_bytes / 1024) - if (downloaded_bytes / 1024 ) == (self.progress_bar.total_bytes / 1024): + if (downloaded_bytes / 1024) == (self.progress_bar.total_bytes / 1024): self.status_code_label.setText("200") self.status_code_label.setStyleSheet( self.common.gui.css["history_individual_file_status_code_label_2xx"] diff --git a/onionshare_gui/tab/mode/mode_settings_widget.py b/onionshare_gui/tab/mode/mode_settings_widget.py index ed224589..7c3b4667 100644 --- a/onionshare_gui/tab/mode/mode_settings_widget.py +++ b/onionshare_gui/tab/mode/mode_settings_widget.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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/>. """ + from PyQt5 import QtCore, QtWidgets from onionshare import strings diff --git a/onionshare_gui/tab/mode/receive_mode/__init__.py b/onionshare_gui/tab/mode/receive_mode/__init__.py index 6f1bc7f5..6482b924 100644 --- a/onionshare_gui/tab/mode/receive_mode/__init__.py +++ b/onionshare_gui/tab/mode/receive_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 os from PyQt5 import QtCore, QtWidgets, QtGui diff --git a/onionshare_gui/tab/mode/share_mode/__init__.py b/onionshare_gui/tab/mode/share_mode/__init__.py index aa386e3d..3fd545de 100644 --- a/onionshare_gui/tab/mode/share_mode/__init__.py +++ b/onionshare_gui/tab/mode/share_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 os from PyQt5 import QtCore, QtWidgets, QtGui diff --git a/onionshare_gui/tab/mode/share_mode/threads.py b/onionshare_gui/tab/mode/share_mode/threads.py index 414c7be1..500b6525 100644 --- a/onionshare_gui/tab/mode/share_mode/threads.py +++ b/onionshare_gui/tab/mode/share_mode/threads.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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/>. """ + from PyQt5 import QtCore diff --git a/onionshare_gui/tab/mode/website_mode/__init__.py b/onionshare_gui/tab/mode/website_mode/__init__.py index c520d8f7..29019cb5 100644 --- a/onionshare_gui/tab/mode/website_mode/__init__.py +++ b/onionshare_gui/tab/mode/website_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 os import random import string diff --git a/onionshare_gui/tab/server_status.py b/onionshare_gui/tab/server_status.py index b26a1223..efa50669 100644 --- a/onionshare_gui/tab/server_status.py +++ b/onionshare_gui/tab/server_status.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 platform import textwrap from PyQt5 import QtCore, QtWidgets, QtGui diff --git a/onionshare_gui/tab/tab.py b/onionshare_gui/tab/tab.py index fbc828ff..69916f06 100644 --- a/onionshare_gui/tab/tab.py +++ b/onionshare_gui/tab/tab.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 queue from PyQt5 import QtCore, QtWidgets, QtGui, QtSvg diff --git a/onionshare_gui/tab_widget.py b/onionshare_gui/tab_widget.py index 1eee0181..fe80b95d 100644 --- a/onionshare_gui/tab_widget.py +++ b/onionshare_gui/tab_widget.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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/>. """ + from PyQt5 import QtCore, QtWidgets, QtGui from onionshare import strings diff --git a/onionshare_gui/threads.py b/onionshare_gui/threads.py index 29554039..d1e6ea3c 100644 --- a/onionshare_gui/threads.py +++ b/onionshare_gui/threads.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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 time import json import os diff --git a/onionshare_gui/tor_connection_dialog.py b/onionshare_gui/tor_connection_dialog.py index 9c17e65c..02868625 100644 --- a/onionshare_gui/tor_connection_dialog.py +++ b/onionshare_gui/tor_connection_dialog.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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/>. """ + from PyQt5 import QtCore, QtWidgets, QtGui from onionshare import strings diff --git a/onionshare_gui/update_checker.py b/onionshare_gui/update_checker.py index 452bcb5b..699ad952 100644 --- a/onionshare_gui/update_checker.py +++ b/onionshare_gui/update_checker.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,6 +17,7 @@ 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/>. """ + from PyQt5 import QtCore import datetime, time, socket, re, platform import socks diff --git a/onionshare_gui/widgets.py b/onionshare_gui/widgets.py index 58ddd1b5..846ff4e7 100644 --- a/onionshare_gui/widgets.py +++ b/onionshare_gui/widgets.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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 @@ -17,10 +17,12 @@ 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/>. """ + from PyQt5 import QtCore, QtWidgets, QtGui from onionshare import strings import qrcode + class Alert(QtWidgets.QMessageBox): """ An alert box dialog. @@ -102,8 +104,7 @@ class Image(qrcode.image.base.BaseImage): self.width = width self.box_size = box_size size = (width + border * 2) * box_size - self._image = QtGui.QImage( - size, size, QtGui.QImage.Format_RGB16) + self._image = QtGui.QImage(size, size, QtGui.QImage.Format_RGB16) self._image.fill(QtCore.Qt.white) def pixmap(self): @@ -114,8 +115,10 @@ class Image(qrcode.image.base.BaseImage): painter.fillRect( (col + self.border) * self.box_size, (row + self.border) * self.box_size, - self.box_size, self.box_size, - QtCore.Qt.black) + self.box_size, + self.box_size, + QtCore.Qt.black, + ) def save(self, stream, kind=None): pass @@ -135,8 +138,7 @@ class QRCodeDialog(QtWidgets.QDialog): self.common.log("QrCode", "__init__") self.qr_label = QtWidgets.QLabel(self) - self.qr_label.setPixmap( - qrcode.make(self.text, image_factory=Image).pixmap()) + self.qr_label.setPixmap(qrcode.make(self.text, image_factory=Image).pixmap()) self.qr_label_description = QtWidgets.QLabel(self) self.qr_label_description.setText(strings._("gui_qr_code_description")) @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com> +Copyright (C) 2014-2020 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/tests/test_cli.py b/tests/test_cli.py index 3c85e60d..7cc61853 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1,22 +1,3 @@ -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2018 Micah Lee <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 -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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 os import pytest diff --git a/tests/test_cli_common.py b/tests/test_cli_common.py index 3592d1ba..3756c09f 100644 --- a/tests/test_cli_common.py +++ b/tests/test_cli_common.py @@ -1,22 +1,3 @@ -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2018 Micah Lee <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 -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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 contextlib import inspect import io diff --git a/tests/test_cli_settings.py b/tests/test_cli_settings.py index 7a1e8de5..ec238685 100644 --- a/tests/test_cli_settings.py +++ b/tests/test_cli_settings.py @@ -1,22 +1,3 @@ -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2018 Micah Lee <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 -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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 json import os import tempfile diff --git a/tests/test_cli_strings.py b/tests/test_cli_strings.py index 7ad65191..bb4ccdde 100644 --- a/tests/test_cli_strings.py +++ b/tests/test_cli_strings.py @@ -1,23 +1,4 @@ # -*- coding: utf-8 -*- -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2018 Micah Lee <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 -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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 types import pytest diff --git a/tests/test_cli_web.py b/tests/test_cli_web.py index 2e7d427b..dbc234de 100644 --- a/tests/test_cli_web.py +++ b/tests/test_cli_web.py @@ -1,22 +1,3 @@ -""" -OnionShare | https://onionshare.org/ - -Copyright (C) 2014-2018 Micah Lee <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 -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -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 contextlib import inspect import io @@ -110,7 +91,9 @@ class TestWeb: assert web.running == False - def test_share_mode_autostop_sharing_off(self, temp_dir, common_obj, temp_file_1024): + def test_share_mode_autostop_sharing_off( + self, temp_dir, common_obj, temp_file_1024 + ): web = web_obj(temp_dir, common_obj, "share", 3) web.settings.set("share", "autostop_sharing", False) |