Merge branch 'master' into development

2021-03-14 15:06:20 +01:00
parent f77d72fd86 8c751eb532
commit 22c93e2389
13 changed files with 257 additions and 185 deletions
@@ -138,7 +138,7 @@ class WebServer(object):
        return sock, _readable_listen_address(*address)

    @staticmethod
-    def _get_args_for_reloading(self):
+    def _get_args_for_reloading():
        """Determine how the script was executed, and return the args needed
        to execute it again in a new process.
        Code from https://github.com/pyload/pyload. Author GammaC0de, voulter