Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.

CURA-2917
This commit is contained in:
Simon Edwards 2016-12-12 16:05:35 +01:00
parent 5884509af1
commit 74e5798509
20 changed files with 134 additions and 128 deletions

View file

@ -28,7 +28,7 @@ class XmlMaterialProfile(InstanceContainer):
super().setReadOnly(read_only)
basefile = self.getMetaDataEntry("base_file", self._id) # if basefile is self.id, this is a basefile.
for container in UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile):
for container in ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile):
container._read_only = read_only # prevent loop instead of calling setReadOnly
## Overridden from InstanceContainer
@ -44,7 +44,7 @@ class XmlMaterialProfile(InstanceContainer):
basefile = self.getMetaDataEntry("base_file", self._id) #if basefile is self.id, this is a basefile.
# Update all containers that share GUID and basefile
for container in UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile):
for container in ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile):
container.setMetaDataEntry(key, value)
## Overridden from InstanceContainer, similar to setMetaDataEntry.