Move TEMPLATES_DIR constant into web server module.

diff --git a/plomtask/http.py b/plomtask/http.py
index 8106d13c3c9f5c65b16dd1df12705543e183d46e..01a949e019eddbf9919f333d252a05aeb7dcd4e7 100644 (file)
--- a/plomtask/http.py
+++ b/plomtask/http.py
@@ -8,14 +8,16 @@ from plomtask.days import Day
 from plomtask.misc import HandledException
 from plomtask.db import DatabaseConnection
 
+TEMPLATES_DIR = 'templates'
+
 
 class TaskServer(HTTPServer):
     """Variant of HTTPServer that knows .jinja as Jinja Environment."""
 
-    def __init__(self, templates_dir, db_file, *args, **kwargs):
+    def __init__(self, db_file, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.db = db_file
-        self.jinja = JinjaEnv(loader=JinjaFSLoader(templates_dir))
+        self.jinja = JinjaEnv(loader=JinjaFSLoader(TEMPLATES_DIR))
 
 
 class TaskHandler(BaseHTTPRequestHandler):

diff --git a/run.py b/run.py
index 33346375ea8ad03a19b43ce8f26e0c3e8498bbbd..31d11cee0534b5ae68c3bf84692f61b87b9e7481 100755 (executable)
--- a/run.py
+++ b/run.py
@@ -8,7 +8,6 @@ from plomtask.db import DatabaseFile
 
 PLOMTASK_DB_PATH = environ.get('PLOMTASK_DB_PATH')
 HTTP_PORT = 8082
-TEMPLATES_DIR = 'templates'
 DB_CREATION_ASK = 'Database file not found. Create? Y/n\n'
 
 
@@ -25,8 +24,7 @@ if __name__ == '__main__':
             else:
                 print('Not recognizing reply as "yes".')
                 raise HandledException('Cannot run without database.')
-        server = TaskServer(TEMPLATES_DIR, db_file,
-                            ('localhost', HTTP_PORT), TaskHandler)
+        server = TaskServer(db_file, ('localhost', HTTP_PORT), TaskHandler)
         print(f'running at port {HTTP_PORT}')
         try:
             server.serve_forever()