simplify move version info to gi_import

which makes it easier to switch version too

xpra/client/gl/window.py

@@ -13,7 +13,7 @@
 from xpra.scripts.config import FALSE_OPTIONS
 from xpra.util.types import AtomicInteger, typedict
 from xpra.util.env import envint
-from xpra.os_util import WIN32, OSX, load_binary_file
+from xpra.os_util import WIN32, OSX, load_binary_file, gi_import
 from xpra.log import Logger
 from xpra.platform.paths import get_icon_filename
 from xpra.client.gui.fake_client import FakeClient
@@ -164,9 +164,8 @@ def draw():
         if show:
             widget.show()
             window.show()
-            import gi
-            gi.require_version("Gtk", "3.0")  # @UndefinedVariable
-            from gi.repository import Gtk, GLib  # @UnresolvedImport
+            Gtk = gi_import("Gtk")  # @UndefinedVariable
+            GLib = gi_import("GLib")
 
             def window_close_event(*_args):
                 Gtk.main_quit()

xpra/client/gtk3/client.py

@@ -5,16 +5,16 @@
 
 import os
 
-import gi
-gi.require_version("Gtk", "3.0")  # @UndefinedVariable
-gi.require_version("Gdk", "3.0")  # @UndefinedVariable
-from gi.repository import GObject, Gdk
-
-from xpra.os_util import OSX, POSIX, is_Wayland
+from xpra.os_util import OSX, POSIX, is_Wayland, gi_import
 from xpra.client.gtk3.client_base import GTKXpraClient
 from xpra.client.gtk3.window import ClientWindow
 from xpra.platform.gui import get_xdpi, get_ydpi
 
+Gtk = gi_import("Gtk")
+Gdk = gi_import("Gdk")
+GObject = gi_import("GObject")
+
+
 class XpraClient(GTKXpraClient):
 
     ClientWindowClass = ClientWindow

xpra/client/gtk3/client_base.py

@@ -11,17 +11,14 @@
 from subprocess import Popen, PIPE
 from threading import Event
 from typing import Any
-import gi
-gi.require_version("Gtk", "3.0")  # @UndefinedVariable
-gi.require_version("Gdk", "3.0")  # @UndefinedVariable
-from gi.repository import Gtk, Gdk, GdkPixbuf  # @UnresolvedImport
 
 from xpra.util.types import typedict
 from xpra.util.str_fn import csv, ellipsizer, repr_ellipsized, pver
 from xpra.util.env import envint, envbool
 from xpra.os_util import (
     bytestostr, strtobytes, memoryview_to_bytes,
     hexstr, load_binary_file, osexpand,
+    gi_import,
     WIN32, OSX, POSIX, is_Wayland, first_time,
 )
 from xpra.net.common import PacketType
@@ -64,6 +61,10 @@
 grablog = Logger("client", "grab")
 focuslog = Logger("client", "focus")
 
+Gtk = gi_import("Gtk")
+Gdk = gi_import("Gdk")
+GdkPixbuf = gi_import("GdkPixbuf")
+
 missing_cursor_names = set()
 
 METADATA_SUPPORTED = os.environ.get("XPRA_METADATA_SUPPORTED")

xpra/client/gtk3/keyboard_helper.py

@@ -5,13 +5,12 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-import gi
-gi.require_version('Gdk', '3.0')  # @UndefinedVariable
-from gi.repository import GLib, Gdk  # @UnresolvedImport
-
 from xpra.client.gui.keyboard_helper import KeyboardHelper, log
 from xpra.gtk.keymap import get_gtk_keymap
-from xpra.os_util import is_X11
+from xpra.os_util import is_X11, gi_import
+
+Gdk = gi_import("Gdk")
+GLib = gi_import("GLib")
 
 
 class GTKKeyboardHelper(KeyboardHelper):

xpra/client/gtk3/launcher.py

@@ -17,22 +17,14 @@
 import sys
 import traceback
 
-import gi
-
-
-gi.require_version("Gtk", "3.0")  # @UndefinedVariable
-gi.require_version("GdkPixbuf", "2.0")  # @UndefinedVariable
-# @UnresolvedImport pylint: disable=wrong-import-position
-from gi.repository import GLib, Gtk, GdkPixbuf  # @UnresolvedImport
-
 from xpra.scripts.config import read_config, make_defaults_struct, validate_config, save_config
 from xpra.gtk.signals import register_os_signals
 from xpra.gtk.util import IgnoreWarningsContext
 from xpra.gtk.window import add_close_accel
 from xpra.gtk.widget import scaled_image, imagebutton, label, choose_file, modify_fg, color_parse
 from xpra.gtk.pixbuf import get_icon_pixbuf
 from xpra.util.str_fn import csv, repr_ellipsized
-from xpra.os_util import WIN32, OSX
+from xpra.os_util import WIN32, OSX, gi_import
 from xpra.net.common import DEFAULT_PORT
 from xpra.util.thread import start_thread
 from xpra.gtk.dialogs.about import about
@@ -47,6 +39,10 @@
 
 log = Logger("launcher")
 
+Gtk = gi_import("Gtk")
+GdkPixbuf = gi_import("GdkPixbuf")
+GLib = gi_import("GLib")
+
 MODE_NESTED_SSH = "ssh -> ssh"
 MODE_SSH = "ssh"
 MODE_TCP = "tcp"

xpra/client/gtk3/menu_helper.py

@@ -7,14 +7,9 @@
 import re
 from collections.abc import Callable
 
-import gi
-gi.require_version('Gtk', '3.0')  # @UndefinedVariable
-gi.require_version("GdkPixbuf", "2.0")  # @UndefinedVariable
-from gi.repository import Gtk, GdkPixbuf  # @UnresolvedImport
-
 from xpra.util.str_fn import repr_ellipsized
 from xpra.util.env import envbool
-from xpra.os_util import OSX, bytestostr
+from xpra.os_util import OSX, bytestostr, gi_import
 from xpra.codecs.icon_util import INKSCAPE_RE
 from xpra.gtk.widget import scaled_image, menuitem
 from xpra.gtk.util import IgnoreWarningsContext
@@ -26,6 +21,9 @@
 
 log = Logger("menu")
 
+Gtk = gi_import("Gtk")
+GdkPixbuf = gi_import("GdkPixbuf")
+
 MENU_ICONS = envbool("XPRA_MENU_ICONS", True)
 HIDE_DISABLED_MENU_ENTRIES = envbool("XPRA_HIDE_DISABLED_MENU_ENTRIES", False)
 

xpra/client/gtk3/statusicon_tray.py

@@ -8,18 +8,17 @@
 
 import os
 from time import time, monotonic
-import gi
-gi.require_version('Gdk', '3.0')  # @UndefinedVariable
-gi.require_version('Gtk', '3.0')  # @UndefinedVariable
-gi.require_version("GdkPixbuf", "2.0")  # @UndefinedVariable
-from gi.repository import Gtk, Gdk, GdkPixbuf  # @UnresolvedImport
 
-from xpra.os_util import WIN32, OSX, POSIX
+from xpra.os_util import WIN32, OSX, POSIX, gi_import
 from xpra.util.env import envbool
 from xpra.client.gui.tray_base import TrayBase, log
 from xpra.gtk.util import get_default_root_window
 from xpra.gtk.pixbuf import get_icon_from_file, get_pixbuf_from_data
 
+Gdk = gi_import("Gdk")
+Gtk = gi_import("Gtk")
+GdkPixbuf = gi_import("GdkPixbuf")
+
 ORIENTATION = {
     Gtk.Orientation.HORIZONTAL  : "HORIZONTAL",
     Gtk.Orientation.VERTICAL    : "VERTICAL",

xpra/client/gtk3/window.py

@@ -5,36 +5,35 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-import gi
-gi.require_version("Gtk", "3.0")
-gi.require_version("Gdk", "3.0")
-gi.require_version("GdkPixbuf", "2.0")
-from gi.repository import GObject, Gdk, Gtk, Gio, GdkPixbuf  # @UnresolvedImport
-
 from xpra.client.gtk3.window_base import GTKClientWindowBase, HAS_X11_BINDINGS
 from xpra.client.gtk3.window_menu import WindowMenuHelper
 from xpra.gtk.widget import scaled_image
 from xpra.gtk.pixbuf import get_icon_pixbuf
 from xpra.scripts.config import TRUE_OPTIONS, FALSE_OPTIONS
 from xpra.util.types import typedict
 from xpra.util.env import envbool
-from xpra.os_util import bytestostr, is_gnome
+from xpra.os_util import bytestostr, is_gnome, gi_import
 from xpra.log import Logger
 
 paintlog = Logger("paint")
 metalog = Logger("metadata")
 geomlog = Logger("geometry")
 
+Gtk = gi_import("Gtk")
+Gdk = gi_import("Gdk")
+GdkPixbuf = gi_import("GdkPixbuf")
+GObject = gi_import("GObject")
+Gio = gi_import("Gio")
 
 WINDOW_ICON = envbool("XPRA_WINDOW_ICON", True)
 WINDOW_XPRA_MENU = envbool("XPRA_WINDOW_XPRA_MENU", is_gnome())
 WINDOW_MENU = envbool("XPRA_WINDOW_MENU", True)
 
 
-"""
-GTK3 version of the ClientWindow class
-"""
 class ClientWindow(GTKClientWindowBase):
+    """
+    GTK3 version of the ClientWindow class
+    """
 
     def init_window(self, metadata:typedict):
         super().init_window(metadata)
@@ -226,4 +225,5 @@ def draw_widget(self, widget, context) -> bool:
             self.paint_spinner(context)
         return True
 
+
 GObject.type_register(ClientWindow)

xpra/client/mixins/tray.py

@@ -2,7 +2,7 @@
 # Copyright (C) 2010-2023 Antoine Martin <antoine@xpra.org>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
-#pylint: disable-msg=E1101
+#  pylint: disable-msg=E1101
 
 from gi.repository import GLib
 

xpra/codecs/gstreamer/encoder.py

@@ -28,7 +28,7 @@
 from xpra.codecs.image import ImageWrapper
 from xpra.log import Logger
 
-GObject = gi_import("GObject", "2.0")
+GObject = gi_import("GObject")
 Gst = import_gst()
 log = Logger("encoder", "gstreamer")
 

xpra/codecs/icon_util.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # This file is part of Xpra.
-# Copyright (C) 2018-2022 Antoine Martin <antoine@xpra.org>
+# Copyright (C) 2018-2023 Antoine Martin <antoine@xpra.org>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
@@ -14,7 +14,7 @@
 
 from xpra.util.str_fn import ellipsizer
 from xpra.util.env import envint, envbool
-from xpra.os_util import load_binary_file, first_time
+from xpra.os_util import load_binary_file, first_time, gi_import
 from xpra.log import Logger
 
 log = Logger("menu")
@@ -32,10 +32,8 @@
 def load_Rsvg():
     global _Rsvg
     if _Rsvg is None:
-        import gi  #pylint: disable=import-outside-toplevel
         try:
-            gi.require_version('Rsvg', '2.0')  # @UndefinedVariable
-            from gi.repository import Rsvg  # pylint: disable=import-outside-toplevel @UnresolvedImport
+            Rsvg = gi_import("Rsvg")
             log("load_Rsvg() Rsvg=%s", Rsvg)
             _Rsvg = Rsvg
         except (ValueError, ImportError) as e:

xpra/gstreamer/common.py

@@ -42,7 +42,7 @@ def import_gst() -> ModuleType | None:
         {k:v for k,v in os.environ.items() if (k.startswith("GST") or k.startswith("GI") or k=="PATH")})
     log("GStreamer 1.x sys.path=%s", csv(sys.path))
     try:
-        Gst = gi_import("Gst", "1.0")
+        Gst = gi_import("Gst")
         log("Gst=%s", Gst)
         Gst.init(None)
     except Exception as e:

xpra/gstreamer/pipeline.py

@@ -24,8 +24,8 @@
 Gst : ModuleType = import_gst()
 if not Gst:
     raise ImportError("GStreamer bindings not found")
-GLib = gi_import("GLib", "2.0")
-GObject = gi_import("GObject", "2.0")
+GLib = gi_import("GLib")
+GObject = gi_import("GObject")
 
 
 class Pipeline(GObject.GObject):

xpra/gtk/__init__.py

@@ -3,8 +3,8 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-import gi
-gi.require_version("Gdk", "3.0")  # @UndefinedVariable
-gi.require_version("Gtk", "3.0")  # @UndefinedVariable
-gi.require_version("Pango", "1.0")  # @UndefinedVariable
-gi.require_version("GdkPixbuf", "2.0")  # @UndefinedVariable
+from xpra.os_util import gi_import
+gi_import("Gdk")
+gi_import("Gtk")
+gi_import("Pango")
+gi_import("GdkPixbuf")

xpra/gtk/clipboard.py

@@ -1,23 +1,23 @@
 # This file is part of Xpra.
-# Copyright (C) 2019-2021 Antoine Martin <antoine@xpra.org>
+# Copyright (C) 2019-2023 Antoine Martin <antoine@xpra.org>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
 from time import monotonic
-import gi
-gi.require_version('Gdk', '3.0')  # @UndefinedVariable
-gi.require_version('Gtk', '3.0')  # @UndefinedVariable
-from gi.repository import GObject, Gtk, Gdk  # @UnresolvedImport
 
 from xpra.gtk.gobject import n_arg_signal, one_arg_signal
 from xpra.clipboard.core import (
     ClipboardProxyCore, TEXT_TARGETS,
     )
 from xpra.clipboard.timeout import ClipboardTimeoutHelper
+from xpra.os_util import gi_import
 from xpra.util.str_fn import ellipsizer
 from xpra.util.env import envint
 from xpra.log import Logger
 
+Gtk = gi_import("Gtk")
+Gdk = gi_import("Gdk")
+GObject = gi_import("GObject")
 
 log = Logger("clipboard")
 

xpra/gtk/configure/features.py

@@ -3,14 +3,12 @@
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
 
-import gi
-
 from xpra.gtk.dialogs.base_gui_window import BaseGUIWindow
 from xpra.gtk.widget import label
+from xpra.os_util import gi_import
 from xpra.log import Logger
 
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
+Gtk = gi_import("Gtk")
 
 log = Logger("util")
 

xpra/gtk/configure/gstreamer.py

@@ -8,15 +8,14 @@
 from subprocess import Popen, PIPE, check_call
 
 from xpra.util.types import AtomicInteger
-from xpra.os_util import is_X11, is_gnome, OSX, WIN32, POSIX
+from xpra.os_util import is_X11, is_gnome, gi_import, OSX, WIN32, POSIX
 from xpra.gtk.dialogs.base_gui_window import BaseGUIWindow
 from xpra.gtk.widget import label, slabel, title_box
 from xpra.platform.paths import get_image
 from xpra.log import Logger
 
-import gi
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk, GLib
+Gtk = gi_import("Gtk")
+GLib = gi_import("GLib")
 
 log = Logger("gstreamer", "util")
 

xpra/gtk/configure/main.py

@@ -2,19 +2,19 @@
 # Copyright (C) 2018-2023 Antoine Martin <antoine@xpra.org>
 # Xpra is released under the terms of the GNU GPL v2, or, at your option, any
 # later version. See the file COPYING for details.
+
 import os.path
 from importlib import import_module
-import gi
 
 from xpra.scripts.config import InitExit
 from xpra.exit_codes import ExitCode
+from xpra.os_util import gi_import
 from xpra.util.parsing import parse_simple_dict
 from xpra.gtk.dialogs.base_gui_window import BaseGUIWindow
 from xpra.gtk.widget import label
 from xpra.log import Logger
 
-gi.require_version('Gtk', '3.0')
-from gi.repository import Gtk
+Gtk = gi_import("Gtk")
 
 log = Logger("util")