From f82f4c25827cd04b22c3c9ca8948653f8b79b9e5 Mon Sep 17 00:00:00 2001 From: burnettk Date: Thu, 27 Oct 2022 15:15:03 -0400 Subject: [PATCH] Squashed 'SpiffWorkflow/' changes from 3579c477e..2d3bd0085 2d3bd0085 Merge pull request #261 from sartography/feature/xml-validation a67abd453 Merge pull request #260 from sartography/feature/add_init_to_schema 905c1265d remove debug code w/ burnettk 8daf322da attempt using package data w/ burnettk 7f7c0c10b add an init file to schema directory to see if it can be picked up as a package w/ burnettk abb2898b1 cleaning up code smell git-subtree-dir: SpiffWorkflow git-subtree-split: 2d3bd00854ab483e823c4b386430abc9267f536b --- SpiffWorkflow/bpmn/parser/node_parser.py | 8 ++++---- SpiffWorkflow/bpmn/parser/schema/__init__.py | 1 + setup.py | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 SpiffWorkflow/bpmn/parser/schema/__init__.py diff --git a/SpiffWorkflow/bpmn/parser/node_parser.py b/SpiffWorkflow/bpmn/parser/node_parser.py index a6f05a57..b76ccfbb 100644 --- a/SpiffWorkflow/bpmn/parser/node_parser.py +++ b/SpiffWorkflow/bpmn/parser/node_parser.py @@ -25,7 +25,7 @@ class NodeParser: def xpath(self, xpath, extra_ns=None): return self._xpath(self.node, xpath, extra_ns) - + def doc_xpath(self, xpath, extra_ns=None): root = self.node.getroottree().getroot() return self._xpath(root, xpath, extra_ns) @@ -62,8 +62,8 @@ class NodeParser: extensions = {} extra_ns = {'camunda': CAMUNDA_MODEL_NS} extension_nodes = self.xpath('.//bpmn:extensionElements/camunda:properties/camunda:property', extra_ns) - for node in extension_nodes: - extensions[node.get('name')] = node.get('value') + for ex_node in extension_nodes: + extensions[ex_node.get('name')] = ex_node.get('value') return extensions def _get_lane(self): @@ -82,4 +82,4 @@ class NodeParser: nsmap.update(extra_ns) else: nsmap = self.nsmap - return node.xpath(xpath, namespaces=nsmap) \ No newline at end of file + return node.xpath(xpath, namespaces=nsmap) diff --git a/SpiffWorkflow/bpmn/parser/schema/__init__.py b/SpiffWorkflow/bpmn/parser/schema/__init__.py new file mode 100644 index 00000000..e70a73fa --- /dev/null +++ b/SpiffWorkflow/bpmn/parser/schema/__init__.py @@ -0,0 +1 @@ +"""__init.py__""" diff --git a/setup.py b/setup.py index d637c587..15522250 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,7 @@ setup(name='SpiffWorkflow', author_email='dan@sartography.com', license='lGPLv2', packages=find_packages(exclude=['tests', 'tests.*']), + package_data={'SpiffWorkflow.bpmn.parser.schema': ['*.xsd']}, install_requires=['configparser', 'lxml', 'celery', 'dateparser', 'pytz', # required for python 3.7 - https://stackoverflow.com/a/73932581 'importlib-metadata<5.0; python_version <= "3.7"'],