chg: dev: move old directory support to serv_run, update daemon script

Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>

pyserv/__init__.py

@@ -3,7 +3,6 @@
 """
 
 import logging
-import os
 import sys
 import threading
 from functools import partial
@@ -98,8 +97,6 @@ def __init__(self, iface, port, directory):
 
     def run(self):
         """Start main server thread"""
-        if sys.version_info < (3, 7):
-            os.chdir(self.directory)
         self.server.serve_forever()
 
     def stop(self):

pyserv/server.py

@@ -4,7 +4,9 @@
 """
 
 import logging
+import os
 import sys
+from pathlib import Path
 
 from . import GetServer
 from .settings import DEBUG, DOCROOT
@@ -33,13 +35,18 @@ def serv_run(iface='', port=8080, directory=DOCROOT):  # pragma: no cover
     :param iface: server listen interface
     :param port: server listen port
     """
+    start_dir = Path.cwd()
+    path_diff = start_dir.name != Path(directory).name
+    if sys.version_info < (3, 7) and path_diff:
+        os.chdir(directory)
     httpd = serv_init(iface, port, directory)
     logging.info('Starting HTTP SERVER at %s:%s', iface, port)
     try:
         httpd.start()
         httpd.join()
     except KeyboardInterrupt:
         httpd.stop()
+        os.chdir(start_dir)
         print("\nExiting ...")
 
 

scripts/httpdaemon

@@ -5,6 +5,7 @@ Http daemon script using pyserv (see settings.py for env vars).
 
 import argparse
 import logging
+import os
 import sys
 from pathlib import Path
 
@@ -41,6 +42,8 @@ class ServDaemon(Daemon):
         Daemon needs a run method. In this case we need to instantiate
         our GetServer obj here, ie, *after* the Daemon object.
         """
+        if sys.version_info < (3, 7):
+            os.chdir(DOCROOT)
         self.servd = GetServer(IFACE, PORT, DOCROOT)
         self.servd.start()