From 71a3726bdf4cd6ecd3d8595006c21d9dde2cf371 Mon Sep 17 00:00:00 2001
From: A-dead-pixel <me@otsrv.net>
Date: Thu, 22 Jun 2023 17:04:35 +0200
Subject: [PATCH] Remove flup6 and deprecated deployment methods

---
 filetracker/servers/base.py | 42 -------------------------------------
 pyproject.toml              |  3 +--
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/filetracker/servers/base.py b/filetracker/servers/base.py
index 30d8ecf..272be41 100644
--- a/filetracker/servers/base.py
+++ b/filetracker/servers/base.py
@@ -86,48 +86,6 @@ def get_endpoint_and_path(environ):
         return components[0], '/'.join(components[1:])
 
 
-# Deprecated, run.py should be used in all cases.
-def start_cgi(server):
-    from flup.server.cgi import WSGIServer
-
-    WSGIServer(server).run()
-    sys.exit(0)
-
-
-# Deprecated, run.py should be used in all cases.
-def start_fcgi(server):
-    from flup.server.fcgi import WSGIServer
-
-    WSGIServer(server).run()
-    sys.exit(0)
-
-
-# Deprecated, run.py should be used in all cases.
-def start_standalone(server, port=8000):
-    from wsgiref.simple_server import make_server
-
-    httpd = make_server('', port, server)
-    print("Serving on port %d..." % port)
-    httpd.serve_forever()
-
-
-def main(server):
-    """A convenience ``main`` method for running WSGI-compatible HTTP
-    application as CGI, FCGI or standalone (with auto-detection)."""
-
-    if 'REQUEST_METHOD' in os.environ:
-        start_cgi(server)
-
-    stdin_sock = socket.fromfd(0, socket.AF_UNIX, socket.SOCK_STREAM)
-    try:
-        stdin_sock.getpeername()
-    except socket.error as e:
-        if e.errno == errno.ENOTCONN:
-            start_fcgi(server)
-
-    start_standalone(server)
-
-
 def _rindex(l, value):
     """Same as str.rindex, but for lists."""
     return len(l) - l[::-1].index(value) - 1
diff --git a/pyproject.toml b/pyproject.toml
index 233945d..ff775a7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,6 @@ classifiers = [
 ]
 dependencies = [
     "bsddb3==6.2.7",
-    "flup6",
     "gunicorn==19.9.0",
     "progressbar2",
     "requests",
@@ -48,4 +47,4 @@ filetracker = "filetracker.client.shell:main"
 filetracker-server = "filetracker.servers.run:main"
 filetracker-cache-cleaner = "filetracker.scripts.cachecleaner:main"
 filetracker-migrate = "filetracker.scripts.migrate:main"
-filetracker-recover = "filetracker.scripts.recover:main"
\ No newline at end of file
+filetracker-recover = "filetracker.scripts.recover:main"