Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2019-09-06 16:18:50 +0300
committerJaime van Kessel <nallath@gmail.com>2019-09-06 16:18:50 +0300
commit608ca3e92af478652f6c67f814f39417e039247a (patch)
treede053a114a726d72d4ecb15d41321e2d812c0920 /plugins/XmlMaterialProfile/XmlMaterialProfile.py
parenta6c27787b974089d086d0cfabf067f3d8c540d20 (diff)
Convert some functions to static
Diffstat (limited to 'plugins/XmlMaterialProfile/XmlMaterialProfile.py')
-rw-r--r--plugins/XmlMaterialProfile/XmlMaterialProfile.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
index 8d0177c165..12b46af6b8 100644
--- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py
+++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
@@ -409,7 +409,8 @@ class XmlMaterialProfile(InstanceContainer):
self._combineElement(self._expandMachinesXML(result), self._expandMachinesXML(second))
return result
- def _createKey(self, element):
+ @staticmethod
+ def _createKey(element):
key = element.tag.split("}")[-1]
if "key" in element.attrib:
key += " key:" + element.attrib["key"]
@@ -425,15 +426,15 @@ class XmlMaterialProfile(InstanceContainer):
# Recursively merges XML elements. Updates either the text or children if another element is found in first.
# If it does not exist, copies it from second.
- def _combineElement(self, first, second):
+ @staticmethod
+ def _combineElement(first, second):
# Create a mapping from tag name to element.
-
mapping = {}
for element in first:
- key = self._createKey(element)
+ key = XmlMaterialProfile._createKey(element)
mapping[key] = element
for element in second:
- key = self._createKey(element)
+ key = XmlMaterialProfile._createKey(element)
if len(element): # Check if element has children.
try:
if "setting" in element.tag and not "settings" in element.tag:
@@ -443,7 +444,7 @@ class XmlMaterialProfile(InstanceContainer):
for child in element:
mapping[key].append(child)
else:
- self._combineElement(mapping[key], element) # Multiple elements, handle those.
+ XmlMaterialProfile._combineElement(mapping[key], element) # Multiple elements, handle those.
except KeyError:
mapping[key] = element
first.append(element)