Fixed an issue where following symlinks on Paths no longer works, fix…

…ed an issue where django tests weren't correctly building output, restored some type hinting on an enum, and fixed some merge errors

python/gui/maas_experiment/application_values.py

@@ -117,7 +117,8 @@ def get_full_localtimezone():
 
     # If this is a system with 'zoneinfo' set up as part of the environment, parse the name from the linked zone
     zone_path = Path("/etc/localtime")
-    zone_path = str(zone_path.readlink()) if zone_path.exists() and zone_path.is_symlink() else ""
+    zone_path = zone_path.resolve()
+    zone_path = str(zone_path) if zone_path.exists() else ""
 
     # We can predict the path if the zone is linked to a file under 'zoneinfo'.
     if 'zoneinfo' in zone_path:

python/lib/core/dmod/core/common/__init__.py

@@ -29,7 +29,7 @@
 from .types import TextValues
 
 
-class Status(CommonEnum):
+class Status(str, CommonEnum):
     """
     Very basic enumeration used to describe the status of something
     """

python/services/evaluationservice/dmod/evaluationservice/evaluation_service/wrapper.py

@@ -61,7 +61,6 @@ def __call__(self, *args: _T, **kwargs: _V) -> typing.Union[_MODEL_TYPE, typing.
 
 
 def wrapper_caller(
-    function: typing.Callable[[typing.Any, ...], typing.Union[_MODEL_TYPE, QuerySet[_MODEL_TYPE]]],
     function: wrapper_fn[_T, _V],
     _wrapper_return_values: WrapperResults,
     args: typing.Sequence[_T],
@@ -114,10 +113,6 @@ def __call_wrapper(
         *args: _T,
         **kwargs: _V,
     ) -> typing.Union[_MODEL_TYPE, typing.Sequence[_MODEL_TYPE]]:
-        function: typing.Callable[[typing.Any, ...], typing.Union[_MODEL_TYPE, QuerySet[_MODEL_TYPE]]],
-        *args,
-        **kwargs
-    ) -> typing.Union[_MODEL_TYPE, typing.List[_MODEL_TYPE]]:
         results = WrapperResults()
 
         if self.__can_use_concurrency:

scripts/test_django.py

@@ -347,8 +347,10 @@ def __interpret_stderr(self):
                     # separated from the previously read
                     if current_description:
                         current_description += os.linesep
+                        current_description += line
+                    else:
+                        current_description = line
 
-                    current_description += line
                 # Otherwise, we want to just tack the read data onto the content of the message we're building
                 else:
                     # If we're on the final line of the messages, just tack on a new line to our content,