Skip to content

Commit b843483

Browse files
committed
Backport PR matplotlib#30657: Fix AttributeError: module 'gi' has no attribute 'require_version'
1 parent 874506d commit b843483

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

lib/matplotlib/backends/backend_gtk3.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
CloseEvent, KeyEvent, LocationEvent, MouseEvent, ResizeEvent)
1111

1212
try:
13-
import gi
13+
from gi import require_version as gi_require_version
1414
except ImportError as err:
1515
raise ImportError("The GTK3 backends require PyGObject") from err
1616

1717
try:
1818
# :raises ValueError: If module/version is already loaded, already
1919
# required, or unavailable.
20-
gi.require_version("Gtk", "3.0")
20+
gi_require_version("Gtk", "3.0")
2121
except ValueError as e:
2222
# in this case we want to re-raise as ImportError so the
2323
# auto-backend selection logic correctly skips.

lib/matplotlib/backends/backend_gtk4.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,20 @@
99
KeyEvent, LocationEvent, MouseEvent, ResizeEvent, CloseEvent)
1010

1111
try:
12-
import gi
12+
from gi import require_version as gi_require_version
1313
except ImportError as err:
1414
raise ImportError("The GTK4 backends require PyGObject") from err
1515

1616
try:
1717
# :raises ValueError: If module/version is already loaded, already
1818
# required, or unavailable.
19-
gi.require_version("Gtk", "4.0")
19+
gi_require_version("Gtk", "4.0")
2020
except ValueError as e:
2121
# in this case we want to re-raise as ImportError so the
2222
# auto-backend selection logic correctly skips.
2323
raise ImportError(e) from e
2424

25+
import gi
2526
from gi.repository import Gio, GLib, Gtk, Gdk, GdkPixbuf
2627
from . import _backend_gtk
2728
from ._backend_gtk import ( # noqa: F401 # pylint: disable=W0611

0 commit comments

Comments
 (0)