Use power of LazyInitialise to murder TFW/TAOENV global state

lib/envvars/__init__.py

@@ -4,9 +4,20 @@
 from collections import namedtuple
 from os import environ
 
+from tfw.decorators import LazyInitialise
 
-def prefixed_envvars_to_namedtuple(prefix: str, tuple_name: str):
+
-    envvars = {envvar.replace(prefix, '', 1): environ.get(envvar)
+class LazyEnvironment:
-               for envvar in environ.keys()
+    def __init__(self, prefix, tuple_name):
-               if envvar.startswith(prefix)}
+        self._prefix = prefix
-    return namedtuple(tuple_name, envvars)(**envvars)
+        self._tuple_name = tuple_name
+
+    @LazyInitialise
+    def environment(self):
+        return self.prefixed_envvars_to_namedtuple()
+
+    def prefixed_envvars_to_namedtuple(self):
+        envvars = {envvar.replace(self._prefix, '', 1): environ.get(envvar)
+                   for envvar in environ.keys()
+                   if envvar.startswith(self._prefix)}
+        return namedtuple(self._tuple_name, envvars)(**envvars)

lib/tao/config/envvars.py

@@ -1,6 +1,6 @@
 # Copyright (C) 2018 Avatao.com Innovative Learning Kft.
 # All Rights Reserved. See LICENSE file for details.
 
-from envvars import prefixed_envvars_to_namedtuple
+from envvars import LazyEnvironment
 
-TAOENV = prefixed_envvars_to_namedtuple('AVATAO_', 'taoenvtuple')
+TAOENV = LazyEnvironment('AVATAO_', 'taoenvtuple').environment

lib/tfw/config/envvars.py

@@ -1,6 +1,6 @@
 # Copyright (C) 2018 Avatao.com Innovative Learning Kft.
 # All Rights Reserved. See LICENSE file for details.
 
-from envvars import prefixed_envvars_to_namedtuple
+from envvars import LazyEnvironment
 
-TFWENV = prefixed_envvars_to_namedtuple('TFW_', 'tfwenvtuple')
+TFWENV = LazyEnvironment('TFW_', 'tfwenvtuple').environment