tricc-oo 1.4.5__tar.gz → 1.4.7__tar.gz

{tricc_oo-1.4.5 → tricc_oo-1.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.5
+Version: 1.4.7
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues
@@ -9,7 +9,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-
 Requires-Dist: lxml
 Requires-Dist: html2text
 Requires-Dist: pydantic

{tricc_oo-1.4.5 → tricc_oo-1.4.7}/pyproject.toml

@@ -4,9 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.4.5"
+version = "1.4.7"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
+license-files = ["LICENSE"]
 
 requires-python = ">=3.8"
 classifiers = [

{tricc_oo-1.4.5 → tricc_oo-1.4.7}/tricc_oo/strategies/output/xlsform_cht.py

@@ -117,7 +117,7 @@ class XLSFormCHTStrategy(XLSFormCDSSStrategy):
         # pause
         ends = []
         for p in self.project.pages.values():
-            p_ends = list(filter(lambda x:  issubclass(x.__class__, TriccNodeEnd) and hasattr(x, 'hint'), p.nodes.values() ))
+            p_ends = list(filter(lambda x:  issubclass(x.__class__, TriccNodeEnd) and getattr(x, 'hint', None) is not None, p.nodes.values() ))
             if p_ends:
                 ends += p_ends
         if ends:

{tricc_oo-1.4.5 → tricc_oo-1.4.7}/tricc_oo/visitors/tricc.py

@@ -31,8 +31,10 @@ def get_max_version(dict):
     return max_version
 
 def get_versions(name, iterable):
-    return [n for n in iterable if ((name == 'tricc_end' and isinstance(n, TriccNodeEnd)) or  n.name == name) and not isinstance(n, TriccNodeSelectOption)]
+    return [n for n in iterable if version_filter(name)(n)]
 
+def version_filter(name):
+    return lambda item: hasattr(item, 'name') and ( (name == 'tricc_end' and isinstance(item, TriccNodeEnd)) or item.name == name ) and not isinstance(item, TriccNodeSelectOption)
 
 def get_last_version(name, processed_nodes,  _list=None):
     max_version = None
@@ -40,7 +42,7 @@ def get_last_version(name, processed_nodes,  _list=None):
         _list = _list[name].values() if name in _list else []
     if _list is None:
         if isinstance(processed_nodes, OrderedSet):
-            return processed_nodes.find_last(lambda item: hasattr(item, 'name') and item.name == name and not isinstance(item, TriccNodeSelectOption))
+            return processed_nodes.find_last(version_filter(name))
         else:    
             _list = get_versions(name, processed_nodes)
     if _list:

{tricc_oo-1.4.5 → tricc_oo-1.4.7}/tricc_oo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.5
+Version: 1.4.7
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues
@@ -9,7 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-License-File: LICENSE.md
+License-File: LICENSE
 Requires-Dist: lxml
 Requires-Dist: html2text
 Requires-Dist: pydantic

{tricc_oo-1.4.5 → tricc_oo-1.4.7}/tricc_oo.egg-info/SOURCES.txt

@@ -1,4 +1,4 @@
-LICENSE.md
+LICENSE
 README.md
 pyproject.toml
 tests/build.py