PySimultan 0.4.3__tar.gz → 0.4.6__tar.gz

{pysimultan-0.4.3 → pysimultan-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PySimultan
-Version: 0.4.3
+Version: 0.4.6
 Project-URL: Documentation, https://github.com/Bühler Maximilian/PySimultan2#readme
 Project-URL: Issues, https://github.com/Bühler Maximilian/PySimultan2/issues
 Project-URL: Source, https://github.com/Bühler Maximilian/PySimultan2

pysimultan-0.4.6/src/PySimultan2/__about__.py

@@ -0,0 +1 @@
+version = '0.4.6'

{pysimultan-0.4.3 → pysimultan-0.4.6}/src/PySimultan2/__init__.py

@@ -1,8 +1,12 @@
 import os
 import sys
 import colorlog
-# from .config import *
-from ruamel.yaml import YAML, yaml_object, add_representer
+from ruamel.yaml import YAML, add_representer
+
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from .data_model import DataModel
+    from .object_mapper import PythonMapper
 
 def setup_logging():
     handler = colorlog.StreamHandler()
@@ -85,16 +89,18 @@ class Config:
         self._default_mapper = None
         self.logger = logger
 
-    def get_default_data_model(self, *args, **kwargs):
+    def get_default_data_model(self, *args, **kwargs) -> 'DataModel':
         return self._default_data_model
 
-    def get_default_mapper(self, *args, **kwargs):
+    def get_default_mapper(self, *args, **kwargs) -> 'PythonMapper':
         return self._default_mapper
 
-    def set_default_data_model(self, data_model):
+    def set_default_data_model(self, data_model: 'DataModel'):
+        self.logger.debug(f'set_default_data_model: {id(data_model)}')
         self._default_data_model = data_model
 
-    def set_default_mapper(self, mapper):
+    def set_default_mapper(self, mapper: 'PythonMapper'):
+        self.logger.debug(f'set_default_mapper: {id(mapper)}')
         self._default_mapper = mapper
 
 

{pysimultan-0.4.3 → pysimultan-0.4.6}/src/PySimultan2/object_mapper.py

@@ -1,9 +1,7 @@
+from copy import copy
 from collections import UserList
-from weakref import WeakSet
-from typing import Type
 from colorlog import getLogger
 
-from . import config
 from .data_model import data_models
 from .utils import *
 from .default_types import ComponentList, component_list_map, ComponentDictionary, component_dict_map
@@ -35,9 +33,10 @@ class PythonMapper(object):
     def __init__(self, *args, **kwargs):
 
         self.name = kwargs.get('name', 'PythonMapper')
-        self.registered_classes = default_registered_classes   # dict with all registered classes: {taxonomy: class}
-        self.mapped_classes = default_mapped_classes           # dict with all mapped classes: {taxonomy: class}
-        self.taxonomy_maps = default_taxonomy_maps             # dict with all taxonomie maps: {taxonomy: taxonomie_map}
+        self.registered_classes = copy(
+            default_registered_classes)  # dict with all registered classes: {taxonomy: class}
+        self.mapped_classes = copy(default_mapped_classes)  # dict with all mapped classes: {taxonomy: class}
+        self.taxonomy_maps = copy(default_taxonomy_maps)  # dict with all taxonomie maps: {taxonomy: taxonomie_map}
 
         self.registered_geometry_classes = {Layer: SimultanLayer,
                                             Vertex: SimultanVertex,
@@ -220,7 +219,7 @@ class PythonMapper(object):
 
         return prop_dict
 
-    def clear(self):
+    def clear(self, remove_from_default=False):
         for cls in self.registered_classes.values():
             cls._cls_instances = WeakSet()
 
@@ -228,7 +227,7 @@ class PythonMapper(object):
             cls._cls_instances = WeakSet()
             cls.__property_cache__ = {}
 
-        if config.get_default_mapper() is self:
+        if remove_from_default and config.get_default_mapper() is self:
             config.set_default_mapper(None)
 
     def copy(self):

pysimultan-0.4.6/tests/resources/new_test_file.txt

@@ -0,0 +1 @@
+This is the content of the file.

pysimultan-0.4.6/tests/resources/new_test_file2.txt

@@ -0,0 +1 @@
+This is the content of the file 2.

pysimultan-0.4.3/src/PySimultan2/__about__.py

@@ -1 +0,0 @@
-version = '0.4.3'