Commit a192ced
Don't raise error when trying to create another Qt app for Qt eventloop (#1071)
* Don't raise error when trying to set another app for Qt eventloop
- This was making the `%matplotlib qt` fail in Spyder.
- It was also generating a long traceback when trying to set another
interactive backend (e.g. tk).
* Remove support to set a Qt4 eventloop because it's no longer supported
* Move big comment outside a function to be part of a docstring
* Don't raise errors in set_qt_api_env_from_gui
Use prints instead because these errors are not displayed to users but
contain valuable information for them.
* Restore loop_qt5 function because it was public API
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Add missing return's in set_qt_api_env_from_gui
This avoids making that function run beyond the point where a certain
message is printed.
* Fix test_qt_enable_gui with the new changes
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>1 parent 4f0e252 commit a192ced
2 files changed
+52
-57
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
118 | | - | |
| 118 | + | |
119 | 119 | | |
120 | | - | |
| 120 | + | |
121 | 121 | | |
| 122 | + | |
122 | 123 | | |
123 | 124 | | |
| 125 | + | |
124 | 126 | | |
125 | 127 | | |
126 | 128 | | |
127 | 129 | | |
128 | 130 | | |
129 | 131 | | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
130 | 136 | | |
131 | 137 | | |
132 | 138 | | |
| |||
428 | 434 | | |
429 | 435 | | |
430 | 436 | | |
431 | | - | |
432 | | - | |
433 | | - | |
434 | | - | |
435 | | - | |
436 | | - | |
437 | | - | |
438 | | - | |
439 | | - | |
440 | | - | |
441 | | - | |
442 | | - | |
443 | | - | |
444 | 437 | | |
445 | 438 | | |
446 | 439 | | |
447 | 440 | | |
448 | | - | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
449 | 455 | | |
450 | 456 | | |
451 | 457 | | |
452 | 458 | | |
453 | | - | |
454 | 459 | | |
455 | 460 | | |
456 | | - | |
457 | 461 | | |
458 | 462 | | |
459 | | - | |
460 | 463 | | |
461 | 464 | | |
462 | 465 | | |
463 | 466 | | |
464 | 467 | | |
465 | 468 | | |
466 | | - | |
467 | | - | |
468 | | - | |
469 | 469 | | |
470 | 470 | | |
471 | 471 | | |
472 | 472 | | |
473 | 473 | | |
474 | 474 | | |
475 | 475 | | |
476 | | - | |
477 | | - | |
| 476 | + | |
| 477 | + | |
478 | 478 | | |
479 | 479 | | |
480 | 480 | | |
481 | 481 | | |
482 | 482 | | |
483 | 483 | | |
484 | 484 | | |
| 485 | + | |
485 | 486 | | |
486 | | - | |
487 | | - | |
488 | | - | |
489 | | - | |
490 | | - | |
491 | | - | |
492 | | - | |
493 | | - | |
494 | | - | |
495 | | - | |
496 | | - | |
497 | | - | |
498 | | - | |
499 | | - | |
| 487 | + | |
500 | 488 | | |
501 | 489 | | |
502 | 490 | | |
| |||
525 | 513 | | |
526 | 514 | | |
527 | 515 | | |
528 | | - | |
529 | | - | |
| 516 | + | |
| 517 | + | |
530 | 518 | | |
531 | 519 | | |
532 | 520 | | |
533 | 521 | | |
534 | | - | |
| 522 | + | |
535 | 523 | | |
536 | 524 | | |
537 | 525 | | |
538 | | - | |
| 526 | + | |
| 527 | + | |
539 | 528 | | |
540 | 529 | | |
541 | 530 | | |
542 | 531 | | |
543 | 532 | | |
544 | | - | |
545 | | - | |
| 533 | + | |
| 534 | + | |
| 535 | + | |
546 | 536 | | |
547 | 537 | | |
| 538 | + | |
548 | 539 | | |
549 | 540 | | |
550 | 541 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | 17 | | |
19 | 18 | | |
20 | 19 | | |
| |||
23 | 22 | | |
24 | 23 | | |
25 | 24 | | |
| 25 | + | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
30 | | - | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | | - | |
| 34 | + | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
37 | 38 | | |
38 | 39 | | |
39 | | - | |
40 | | - | |
41 | 40 | | |
42 | 41 | | |
43 | 42 | | |
| |||
129 | 128 | | |
130 | 129 | | |
131 | 130 | | |
132 | | - | |
| 131 | + | |
133 | 132 | | |
134 | 133 | | |
135 | 134 | | |
136 | 135 | | |
137 | 136 | | |
138 | 137 | | |
| 138 | + | |
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
142 | | - | |
143 | | - | |
144 | | - | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
145 | 146 | | |
146 | 147 | | |
147 | 148 | | |
148 | 149 | | |
149 | 150 | | |
150 | 151 | | |
151 | | - | |
| 152 | + | |
152 | 153 | | |
153 | 154 | | |
154 | 155 | | |
155 | | - | |
156 | | - | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
157 | 159 | | |
158 | | - | |
| 160 | + | |
| 161 | + | |
159 | 162 | | |
| 163 | + | |
0 commit comments