Commit 09e8df9

tacaswellMeeseeksDev[bot]

authored and

MeeseeksDev[bot]

committed

Backport PR matplotlib#12603: FIX: don't import macosx to check if eventloop running

1 parent 65bceb1 commit 09e8df9Copy full SHA for 09e8df9

File tree

+14

-6

lines changed

+14

-6

lines changed

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,8 @@ def _get_running_interactive_framework():`
`48`	`48`	`if frame.f_code == tkinter.mainloop.__code__:`
`49`	`49`	`return "tk"`
`50`	`50`	`frame = frame.f_back`
`51`		`- try:`
`52`		`- from matplotlib.backends import _macosx`
`53`		`- except ImportError:`
`54`		`- pass`
`55`		`- else:`
`56`		`- if _macosx.event_loop_is_running():`
	`51`	`+ if 'matplotlib.backends._macosx' in sys.modules:`
	`52`	`+ if sys.modules["matplotlib.backends._macosx"].event_loop_is_running():`
`57`	`53`	`return "macosx"`
`58`	`54`	`if sys.platform.startswith("linux") and not os.environ.get("DISPLAY"):`
`59`	`55`	`return "headless"`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2580,9 +2580,21 @@ static bool verify_framework(void)`
`2580`	`2580`	`ProcessSerialNumber psn;`
`2581`	`2581`	`/* These methods are deprecated, but they don't require the app to`
`2582`	`2582`	`have started */`
	`2583`	`+#ifdef COMPILING_FOR_10_6`
	`2584`	`+ NSApp = [NSApplication sharedApplication];`
	`2585`	`+ NSApplicationActivationPolicy activationPolicy = [NSApp activationPolicy];`
	`2586`	`+ switch (activationPolicy) {`
	`2587`	`+ case NSApplicationActivationPolicyRegular:`
	`2588`	`+ case NSApplicationActivationPolicyAccessory:`
	`2589`	`+ return true;`
	`2590`	`+ case NSApplicationActivationPolicyProhibited:`
	`2591`	`+ break;`
	`2592`	`+ }`
	`2593`	`+#else`
`2583`	`2594`	`if (CGMainDisplayID()!=0`
`2584`	`2595`	`&& GetCurrentProcess(&psn)==noErr`
`2585`	`2596`	`&& SetFrontProcess(&psn)==noErr) return true;`
	`2597`	`+#endif`
`2586`	`2598`	`PyErr_SetString(PyExc_ImportError,`
`2587`	`2599`	`"Python is not installed as a framework. The Mac OS X backend will "`
`2588`	`2600`	`"not be able to function correctly if Python is not installed as a "`

Comments

(0)