Skip to content

Commit fd04f1c

Browse files
committed
Projects: Use standard way to import Qt modules in qcookiecutter
- Also, set QEventLoop parent as None (the same we use for other objects of the same type). - And simplify keyring import
1 parent 4f65715 commit fd04f1c

1 file changed

Lines changed: 9 additions & 15 deletions

File tree

spyder/plugins/projects/widgets/qcookiecutter.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,15 @@
1010
Cookiecutter widget.
1111
"""
1212

13-
import os
1413
import sys
1514
import tempfile
1615
from collections import OrderedDict
1716

18-
try:
19-
# See: spyder-ide/spyder#10221
20-
if os.environ.get("SSH_CONNECTION") is None:
21-
import keyring
22-
except Exception:
23-
pass
24-
2517
from github import BadCredentialsException, RateLimitExceededException
2618
from jinja2 import Template
27-
from qtpy import QtCore
28-
from qtpy import QtWidgets
19+
import keyring
20+
from qtpy.QtCore import QProcess, QEventLoop, Signal
21+
from qtpy.QtWidgets import QFormLayout
2922
from requests.exceptions import RetryError
3023
from urllib3.exceptions import MaxRetryError
3124

@@ -62,13 +55,14 @@ class CookiecutterWidget(SpyderConfigPage):
6255

6356
CONF_SECTION = "project_explorer"
6457

65-
sig_validated = QtCore.Signal(int, str)
58+
sig_validated = Signal(int, str)
6659
"""
6760
This signal is emitted after validation has been executed.
6861
6962
It provides the process exit code and the output captured.
7063
"""
71-
sig_fatal_render = QtCore.Signal(bool)
64+
65+
sig_fatal_render = Signal(bool)
7266

7367
def __init__(self, parent, project_path=None):
7468
super().__init__(parent)
@@ -130,7 +124,7 @@ def __init__(self, parent, project_path=None):
130124
self._rendered_private_var = None
131125

132126
# Layout
133-
self._form_layout = QtWidgets.QFormLayout()
127+
self._form_layout = QFormLayout()
134128
self._form_layout.setFieldGrowthPolicy(
135129
self._form_layout.AllNonFixedFieldsGrow
136130
)
@@ -368,11 +362,11 @@ def validate(self):
368362
if self._process is not None:
369363
self._process.close()
370364

371-
self._process = QtCore.QProcess(self)
365+
self._process = QProcess(self)
372366
self._process.setProgram(sys.executable)
373367
self._process.setArguments([self._tempfile])
374368

375-
loop = QtCore.QEventLoop()
369+
loop = QEventLoop(None)
376370
self._process.finished.connect(loop.quit)
377371
self._process.start()
378372
loop.exec_()

0 commit comments

Comments
 (0)