Import all gi bindings via lib.gibindings

Ensures that the correct version of bindings are specified before
any binding is imported, even when modules are loaded individually.

This was previously done with an initial import of lib/gichecks.py
but only ensured correct versions when running from main.py.

desktop/mypaint-ora-thumbnailer.py

@@ -32,7 +32,7 @@
 
 gi.require_version("GdkPixbuf", "2.0")
 try:
-    from gi.repository import GdkPixbuf
+    from lib.gibindings import GdkPixbuf
 except:
     raise
 

gui/accelmap.py

@@ -14,9 +14,9 @@
 from __future__ import division, print_function
 import logging
 
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import Pango
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
+from lib.gibindings import Pango
 from lib.gettext import gettext as _
 
 import lib.xml

gui/application.py

@@ -37,11 +37,11 @@
 import logging
 import json
 
-from gi.repository import GObject
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GdkPixbuf
-from gi.repository import GLib
+from lib.gibindings import GObject
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
+from lib.gibindings import GdkPixbuf
+from lib.gibindings import GLib
 from gettext import gettext as _
 
 import lib.observable

gui/autorecover.py

@@ -16,7 +16,7 @@
 import shutil
 import logging
 
-from gi.repository import Gtk
+from lib.gibindings import Gtk
 
 import lib.document
 import lib.helpers

gui/backgroundwindow.py

@@ -17,8 +17,8 @@
 import logging
 
 from gettext import gettext as _
-from gi.repository import Gtk
-from gi.repository import GdkPixbuf
+from lib.gibindings import Gtk
+from lib.gibindings import GdkPixbuf
 
 from . import pixbuflist
 from . import windowing

gui/brusheditor.py

@@ -18,10 +18,10 @@
 import os
 import logging
 
-from gi.repository import Gtk
-from gi.repository import Pango
-from gi.repository import GLib
-from gi.repository import GdkPixbuf
+from lib.gibindings import Gtk
+from lib.gibindings import Pango
+from lib.gibindings import GLib
+from lib.gibindings import GdkPixbuf
 
 from lib.gettext import C_
 from lib import brushsettings

gui/brushiconeditor.py

@@ -12,8 +12,8 @@
 import logging
 from gettext import gettext as _
 
-from gi.repository import Gtk
-from gi.repository import GLib
+from lib.gibindings import Gtk
+from lib.gibindings import GLib
 
 from . import tileddrawwidget
 from . import windowing

gui/brushmanager.py

@@ -28,8 +28,8 @@
 from lib.gettext import C_
 from lib.helpers import utf8
 
-from gi.repository import Gtk
-from gi.repository import GdkPixbuf
+from lib.gibindings import Gtk
+from lib.gibindings import GdkPixbuf
 
 from . import dialogs
 from lib.brush import BrushInfo

gui/brushselectionwindow.py

@@ -20,9 +20,9 @@
 from __future__ import division, print_function
 import logging
 
-from gi.repository import Gtk
-from gi.repository import GdkPixbuf
-from gi.repository import GLib
+from lib.gibindings import Gtk
+from lib.gibindings import GdkPixbuf
+from lib.gibindings import GLib
 
 from lib.gettext import C_
 from lib.gettext import ngettext

gui/builderhacks.py

@@ -13,7 +13,7 @@
 ## Imports
 from __future__ import division, print_function
 
-from gi.repository import Gtk
+from lib.gibindings import Gtk
 
 import lib.xml
 

gui/buttonmap.py

@@ -12,10 +12,10 @@
 from gettext import gettext as _
 import logging
 
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GObject
-from gi.repository import Pango
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
+from lib.gibindings import GObject
+from lib.gibindings import Pango
 
 import lib.xml
 from . import widgets

gui/colors/adjbases.py

@@ -20,10 +20,10 @@
 import logging
 from gettext import gettext as _
 
-from gi.repository import GObject
-from gi.repository import Gdk
-from gi.repository import Gtk
-from gi.repository import GdkPixbuf
+from lib.gibindings import GObject
+from lib.gibindings import Gdk
+from lib.gibindings import Gtk
+from lib.gibindings import GdkPixbuf
 import cairo
 
 from .util import clamp

gui/colors/bases.py

@@ -14,8 +14,8 @@
 import logging
 logger = logging.getLogger(__name__)
 
-from gi.repository import Gtk
-from gi.repository import Gdk
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
 import cairo
 
 

gui/colors/changers.py

@@ -13,8 +13,8 @@
 ## Imports
 from __future__ import division, print_function
 
-from gi.repository import GdkPixbuf
-from gi.repository import Gdk
+from lib.gibindings import GdkPixbuf
+from lib.gibindings import Gdk
 
 import lib.color
 import gui.colors
@@ -123,7 +123,7 @@ class Rings (_CColorChanger):
 
 
 if __name__ == '__main__':
-    from gi.repository import Gtk
+    from lib.gibindings import Gtk
     import os
     import sys
     mgr = gui.colors.ColorManager(prefs={}, datapath='.')

gui/colors/hcywheel.py

@@ -18,8 +18,8 @@
 import re
 import os.path
 
-from gi.repository import Gtk
-from gi.repository import Gdk
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
 import cairo
 
 from .adjbases import ColorManager

gui/colors/hsvcube.py

@@ -16,7 +16,7 @@
 from gettext import gettext as _
 
 import cairo
-from gi.repository import Gtk
+from lib.gibindings import Gtk
 
 from .util import clamp
 from .util import draw_marker_circle

gui/colors/hsvsquare.py

@@ -15,7 +15,7 @@
 import math
 from gettext import gettext as _
 
-from gi.repository import Gtk
+from lib.gibindings import Gtk
 import cairo
 
 from .util import clamp

gui/colors/hsvwheel.py

@@ -14,8 +14,8 @@
 
 from gettext import gettext as _
 
-from gi.repository import Gtk
-from gi.repository import Gdk
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
 
 from .adjbases import HueSaturationWheelAdjuster
 from .sliders import HSVValueSlider

gui/colors/paletteview.py

@@ -24,9 +24,9 @@
 import logging
 from io import open
 
-from gi.repository import Gdk
-from gi.repository import Gtk
-from gi.repository import GLib
+from lib.gibindings import Gdk
+from lib.gibindings import Gtk
+from lib.gibindings import GLib
 import cairo
 from lib.gettext import C_
 

gui/colors/sliders.py

@@ -12,7 +12,7 @@
 
 from __future__ import division, print_function
 
-from gi.repository import Gtk
+from lib.gibindings import Gtk
 
 from lib.color import RGBColor
 from lib.color import HSVColor

gui/colors/uimisc.py

@@ -12,7 +12,7 @@
 
 from __future__ import division, print_function
 
-from gi.repository import Gtk
+from lib.gibindings import Gtk
 
 
 ## Layout constants ##

gui/colortools.py

@@ -11,7 +11,7 @@
 
 from __future__ import division, print_function
 
-from gi.repository import Gtk
+from lib.gibindings import Gtk
 
 from lib.gettext import C_
 

gui/compatibility.py

@@ -9,7 +9,7 @@
 
 from logging import getLogger
 
-from gi.repository import Gtk
+from lib.gibindings import Gtk
 
 from . import compatconfig as config
 

gui/cursor.py

@@ -15,9 +15,9 @@
 import gui.drawutils
 from lib.pycompat import xrange
 
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GdkPixbuf
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
+from lib.gibindings import GdkPixbuf
 
 logger = logging.getLogger(__name__)
 

gui/curve.py

@@ -13,7 +13,7 @@
 import logging
 from math import pi
 
-from gi.repository import Gtk, Gdk
+from lib.gibindings import Gtk, Gdk
 
 from lib.helpers import clamp
 

gui/device.py

@@ -18,9 +18,9 @@
 import re
 
 from lib.gettext import C_
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import Pango
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
+from lib.gibindings import Pango
 
 from lib.observable import event
 import gui.application

gui/dialogs.py

@@ -13,9 +13,9 @@
 ## Imports
 from __future__ import division, print_function
 
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GdkPixbuf
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
+from lib.gibindings import GdkPixbuf
 
 from gettext import gettext as _
 from fnmatch import fnmatch

gui/document.py

@@ -25,9 +25,9 @@
 import weakref
 import logging
 
-from gi.repository import Gtk
-from gi.repository import Gdk
-from gi.repository import GLib
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
+from lib.gibindings import GLib
 
 import lib.document
 import lib.layer

gui/drawutils.py

@@ -28,9 +28,9 @@
 
 import numpy
 import cairo
-from gi.repository import GdkPixbuf
-from gi.repository import Gdk
-from gi.repository import Gtk
+from lib.gibindings import GdkPixbuf
+from lib.gibindings import Gdk
+from lib.gibindings import Gtk
 
 logger = logging.getLogger(__name__)
 

gui/drawwindow.py

@@ -26,8 +26,8 @@
 import math
 import xml.etree.ElementTree as ET
 
-from gi.repository import Gtk
-from gi.repository import Gdk
+from lib.gibindings import Gtk
+from lib.gibindings import Gdk
 
 from . import compatibility
 from . import historypopup

gui/externalapp.py

@@ -24,9 +24,9 @@
 from lib.gettext import C_
 from lib.layer.core import LayerBase  # noqa
 
-from gi.repository import Gio
-from gi.repository import Pango
-from gi.repository import Gtk
+from lib.gibindings import Gio
+from lib.gibindings import Pango
+from lib.gibindings import Gtk
 
 import lib.xml
 

gui/factoryaction.py

@@ -14,8 +14,8 @@
 from warnings import warn
 
 import gi
-from gi.repository import Gtk
-from gi.repository import GObject
+from lib.gibindings import Gtk
+from lib.gibindings import GObject
 
 
 class FactoryAction (Gtk.Action):

gui/filehandling.py

@@ -23,8 +23,8 @@
 from collections import OrderedDict
 import time
 
-from gi.repository import Gtk
-from gi.repository import Pango
+from lib.gibindings import Gtk
+from lib.gibindings import Pango
 
 from lib import helpers
 from lib import fileutils