Update Copyright to 2020 everywhere, and assign to Micah Lee, et al. instead of just Micah Lee

14 files changed, 166 insertions, 22 deletions

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