More updates for imports in plugin_system_manager.
This commit is contained in:
parent
aa22770436
commit
20f294d840
@ -33,16 +33,19 @@ else: # Python 3.5+, no support for python < 3.3.
|
|||||||
import importlib.util
|
import importlib.util
|
||||||
import gi
|
import gi
|
||||||
|
|
||||||
# First try the newer version, then fall back to older version if needed
|
# First handle GIRepository version
|
||||||
try:
|
try:
|
||||||
gi.require_version('GIRepository', '3.0')
|
gi.require_version('GIRepository', '3.0')
|
||||||
except ValueError:
|
except ValueError:
|
||||||
gi.require_version('GIRepository', '2.0')
|
gi.require_version('GIRepository', '2.0')
|
||||||
|
|
||||||
|
# IMPORTANT: No gi.repository imports should happen before GIRepository version is set
|
||||||
gi.require_version('Peas', '1.0')
|
gi.require_version('Peas', '1.0')
|
||||||
|
gi.require_version('Atspi', '2.0')
|
||||||
|
|
||||||
|
# Now it's safe to import from gi.repository
|
||||||
from gi.repository import GObject
|
from gi.repository import GObject
|
||||||
from gi.repository import Peas
|
from gi.repository import Peas
|
||||||
gi.require_version('Atspi', '2.0')
|
|
||||||
from gi.repository import Atspi
|
from gi.repository import Atspi
|
||||||
from cthulhu import resource_manager
|
from cthulhu import resource_manager
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user