Commit3c11289

authored

Merge pull request#19614 from meeseeksmachine/auto-backport-of-pr-19597-on-v3.4.x

Backport PR#19597 on branch v3.4.x (Fix IPython import issue)

2 parents0e4cb23 +a0b2949 commit3c11289Copy full SHA for 3c11289

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1743,7 +1743,7 @@ def _fix_ipython_backend2gui(cls):`
`1743`	`1743`	# `ipython --auto`). This cannot be done at import time due to
`1744`	`1744`	`# ordering issues, so we do it when creating a canvas, and should only`
`1745`	`1745`	# be done once per class (hence the `lru_cache(1)`).
`1746`		`-if"IPython"notinsys.modules:`
	`1746`	`+ifsys.modules.get("IPython")isNone:`
`1747`	`1747`	`return`
`1748`	`1748`	`importIPython`
`1749`	`1749`	`ip=IPython.get_ipython()`

Comments

(0)