From 00e0842850a9d2957754af6914b0f901ea493677 Mon Sep 17 00:00:00 2001
From: Owen Graham <ohgraham1@madisoncollege.edu>
Date: Mon, 13 Jun 2022 17:47:28 -0500
Subject: [PATCH] Move venv-activating code to CGI script
---
htdocs/- | 17 +++++++++++------
visualizer.py | 4 ----
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/htdocs/- b/htdocs/-
index 0551288..4510990 100755
--- a/htdocs/-
+++ b/htdocs/-
@@ -6,10 +6,15 @@ import os.path
import sys
from wsgiref.handlers import CGIHandler
-if __name__ == '__main__':
- # Move to project directory.
- os.chdir('..')
- sys.path[0] = os.path.abspath('.')
+# Move to project directory.
+os.chdir('..')
+sys.path[0] = os.path.abspath('.')
- from visualizer import app
- CGIHandler().run(app)
+# Activate the virtual environment to give visualizer.py access to
+# non-standard packages.
+activator = 'venv/bin/activate_this.py'
+exec(open(activator).read(), {'__file__': activator})
+
+# Run the app as CGI.
+from visualizer import app
+CGIHandler().run(app)
diff --git a/visualizer.py b/visualizer.py
index b035213..dd588e8 100644
--- a/visualizer.py
+++ b/visualizer.py
@@ -5,10 +5,6 @@ import math
from types import SimpleNamespace
from urllib.request import urlopen
-# Activate the virtual env to get access to non-standard packages.
-activator = 'venv/bin/activate_this.py'
-exec(open(activator).read(), {'__file__': activator})
-
import asccol
from dataclasses import make_dataclass
from flask import abort, Flask, g, jsonify, render_template, request, Response
--
GitLab