Commitd85811d

authored

Merge pull request#12603 from jklymak/fix-dont-import-macosx

FIX: don't import macosx to check if eventloop running

2 parents0b9a3e7 +bc7059e commitd85811dCopy full SHA for d85811d

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
`@@ -47,12 +47,8 @@ def _get_running_interactive_framework():`
`47`	`47`	`ifframe.f_code==tkinter.mainloop.__code__:`
`48`	`48`	`return"tk"`
`49`	`49`	`frame=frame.f_back`
`50`		`-try:`
`51`		`-frommatplotlib.backendsimport_macosx`
`52`		`-exceptImportError:`
`53`		`-pass`
`54`		`-else:`
`55`		`-if_macosx.event_loop_is_running():`
	`50`	`+if'matplotlib.backends._macosx'insys.modules:`
	`51`	`+ifsys.modules["matplotlib.backends._macosx"].event_loop_is_running():`
`56`	`52`	`return"macosx"`
`57`	`53`	`ifsys.platform.startswith("linux")andnotos.environ.get("DISPLAY"):`
`58`	`54`	`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 = [NSApplicationsharedApplication];`
	`2585`	`+NSApplicationActivationPolicy activationPolicy = [NSAppactivationPolicy];`
	`2586`	`+switch (activationPolicy) {`
	`2587`	`+case NSApplicationActivationPolicyRegular:`
	`2588`	`+case NSApplicationActivationPolicyAccessory:`
	`2589`	`+returntrue;`
	`2590`	`+case NSApplicationActivationPolicyProhibited:`
	`2591`	`+break;`
	`2592`	`+ }`
	`2593`	`+#else`
`2583`	`2594`	`if (CGMainDisplayID()!=0`
`2584`	`2595`	`&&GetCurrentProcess(&psn)==noErr`
`2585`	`2596`	`&&SetFrontProcess(&psn)==noErr)returntrue;`
	`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)