Ensure that the default default marketplace URL is used when not defined

CURA-7071
This commit is contained in:
Jaime van Kessel 2020-01-30 09:42:51 +01:00
parent e79b3beed1
commit 18163af5a3
No known key found for this signature in database
GPG key ID: 3710727397403C91

View file

@ -16,7 +16,7 @@ from UM.i18n import i18nCatalog
from UM.Version import Version from UM.Version import Version
from cura import ApplicationMetadata from cura import ApplicationMetadata
from cura.CuraVersion import CuraMarketplaceRoot
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
from cura.Machines.ContainerTree import ContainerTree from cura.Machines.ContainerTree import ContainerTree
from plugins.Toolbox.src.CloudApiModel import CloudApiModel from plugins.Toolbox.src.CloudApiModel import CloudApiModel
@ -35,6 +35,11 @@ i18n_catalog = i18nCatalog("cura")
DEFAULT_MARKETPLACE_ROOT = "https://marketplace.ultimaker.com" # type: str DEFAULT_MARKETPLACE_ROOT = "https://marketplace.ultimaker.com" # type: str
try:
from cura.CuraVersion import CuraMarketplaceRoot
except ImportError:
CuraMarketplaceRoot = DEFAULT_MARKETPLACE_ROOT
# todo Remove license and download dialog, use SyncOrchestrator instead # todo Remove license and download dialog, use SyncOrchestrator instead
## Provides a marketplace for users to download plugins an materials ## Provides a marketplace for users to download plugins an materials