Commitb843483

committed

Backport PR#30657: FixAttributeError: module 'gi' has no attribute 'require_version'

1 parent874506d commitb843483Copy full SHA for b843483

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,14 @@`
`10`	`10`	`CloseEvent,KeyEvent,LocationEvent,MouseEvent,ResizeEvent)`
`11`	`11`
`12`	`12`	`try:`
`13`		`-importgi`
	`13`	`+fromgiimportrequire_versionasgi_require_version`
`14`	`14`	`exceptImportErroraserr:`
`15`	`15`	`raiseImportError("The GTK3 backends require PyGObject")fromerr`
`16`	`16`
`17`	`17`	`try:`
`18`	`18`	`# :raises ValueError: If module/version is already loaded, already`
`19`	`19`	`# required, or unavailable.`
`20`		`-gi.require_version("Gtk","3.0")`
	`20`	`+gi_require_version("Gtk","3.0")`
`21`	`21`	`exceptValueErrorase:`
`22`	`22`	`# in this case we want to re-raise as ImportError so the`
`23`	`23`	`# auto-backend selection logic correctly skips.`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,20 @@`
`9`	`9`	`KeyEvent,LocationEvent,MouseEvent,ResizeEvent,CloseEvent)`
`10`	`10`
`11`	`11`	`try:`
`12`		`-importgi`
	`12`	`+fromgiimportrequire_versionasgi_require_version`
`13`	`13`	`exceptImportErroraserr:`
`14`	`14`	`raiseImportError("The GTK4 backends require PyGObject")fromerr`
`15`	`15`
`16`	`16`	`try:`
`17`	`17`	`# :raises ValueError: If module/version is already loaded, already`
`18`	`18`	`# required, or unavailable.`
`19`		`-gi.require_version("Gtk","4.0")`
	`19`	`+gi_require_version("Gtk","4.0")`
`20`	`20`	`exceptValueErrorase:`
`21`	`21`	`# in this case we want to re-raise as ImportError so the`
`22`	`22`	`# auto-backend selection logic correctly skips.`
`23`	`23`	`raiseImportError(e)frome`
`24`	`24`
	`25`	`+importgi`
`25`	`26`	`fromgi.repositoryimportGio,GLib,Gtk,Gdk,GdkPixbuf`
`26`	`27`	`from .import_backend_gtk`
`27`	`28`	`from ._backend_gtkimport (# noqa: F401 # pylint: disable=W0611`

Comments

(0)