mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-19 04:37:51 -06:00
Merge pull request #9781 from Ultimaker/CURA-8146_Fix_getting_PyCapsule_error_on_import
CURA-8146: Fix getting PyCapsule error on import
This commit is contained in:
commit
2813ae62b2
3 changed files with 0 additions and 23 deletions
|
@ -16,14 +16,6 @@ import argparse
|
||||||
import faulthandler
|
import faulthandler
|
||||||
import os
|
import os
|
||||||
|
|
||||||
# Workaround for a race condition on certain systems where there
|
|
||||||
# is a race condition between Arcus and PyQt. Importing Arcus
|
|
||||||
# first seems to prevent Sip from going into a state where it
|
|
||||||
# tries to create PyQt objects on a non-main thread.
|
|
||||||
import Arcus # @UnusedImport
|
|
||||||
import Savitar # @UnusedImport
|
|
||||||
import pynest2d # @UnusedImport
|
|
||||||
|
|
||||||
from PyQt5.QtNetwork import QSslConfiguration, QSslSocket
|
from PyQt5.QtNetwork import QSslConfiguration, QSslSocket
|
||||||
|
|
||||||
from UM.Platform import Platform
|
from UM.Platform import Platform
|
||||||
|
|
|
@ -1,14 +1,6 @@
|
||||||
# Copyright (c) 2020 Jaime van Kessel, Ultimaker B.V.
|
# Copyright (c) 2020 Jaime van Kessel, Ultimaker B.V.
|
||||||
# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher.
|
# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher.
|
||||||
|
|
||||||
# Workaround for a race condition on certain systems where there
|
|
||||||
# is a race condition between Arcus and PyQt. Importing Arcus
|
|
||||||
# first seems to prevent Sip from going into a state where it
|
|
||||||
# tries to create PyQt objects on a non-main thread.
|
|
||||||
import Arcus # @UnusedImport
|
|
||||||
import Savitar # @UnusedImport
|
|
||||||
import pynest2d # @UnusedImport
|
|
||||||
|
|
||||||
from . import PostProcessingPlugin
|
from . import PostProcessingPlugin
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,2 @@
|
||||||
# Copyright (c) 2019 Ultimaker B.V.
|
# Copyright (c) 2019 Ultimaker B.V.
|
||||||
# Cura is released under the terms of the LGPLv3 or higher.
|
# Cura is released under the terms of the LGPLv3 or higher.
|
||||||
|
|
||||||
# Workaround for a race condition on certain systems where there
|
|
||||||
# is a race condition between Arcus and PyQt. Importing Arcus
|
|
||||||
# first seems to prevent Sip from going into a state where it
|
|
||||||
# tries to create PyQt objects on a non-main thread.
|
|
||||||
import Arcus #@UnusedImport
|
|
||||||
import Savitar #@UnusedImport
|
|
Loading…
Add table
Add a link
Reference in a new issue