Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Change subprocess.Popen to QProcess #273

Merged
merged 4 commits into from
Jun 29, 2021
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 34 additions & 17 deletions spyder_terminal/widgets/main_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@
import os
import sys
import requests
import subprocess
import os.path as osp

# Third party imports
from qtpy.QtCore import Signal, QTimer, Slot
from qtpy.QtCore import QProcess, QTimer, Signal, Slot
from qtpy.QtWidgets import QMessageBox, QVBoxLayout
from spyder.api.config.decorators import on_conf_change
from spyder.api.widgets.main_widget import PluginMainWidget
Expand Down Expand Up @@ -79,13 +78,11 @@ def __init__(self, name, plugin, parent):
self.server_ready = False
self.font = None
self.port = select_port(default_port=8071)
self.server_stdout = subprocess.PIPE
self.server_stderr = subprocess.PIPE
self.stdout_file = osp.join(os.getcwd(), 'spyder_terminal_out.log')
self.stderr_file = osp.join(os.getcwd(), 'spyder_terminal_err.log')
self.stdout_file = None
self.stderr_file = None
if get_debug_level() > 0:
self.server_stdout = open(self.stdout_file, 'w')
self.server_stderr = open(self.stderr_file, 'w')
self.stdout_file = osp.join(os.getcwd(), 'spyder_terminal_out.log')
self.stderr_file = osp.join(os.getcwd(), 'spyder_terminal_err.log')
self.project_path = None
self.current_file_path = None
self.current_cwd = os.getcwd()
Expand Down Expand Up @@ -135,11 +132,20 @@ def get_title(self):
def setup(self):
"""Perform the setup of plugin's main menu and signals."""
self.cmd = find_program(self.get_conf('shell'))
self.server = subprocess.Popen(
[sys.executable, '-m', 'spyder_terminal.server',
'--port', str(self.port), '--shell', self.cmd],
stdout=self.server_stdout,
stderr=self.server_stderr)
server_args = [
sys.executable, '-m', 'spyder_terminal.server',
'--port', str(self.port), '--shell', self.cmd]
self.server = QProcess(self)
env = self.server.processEnvironment()
for var in os.environ:
env.insert(var, os.environ[var])
self.server.setProcessEnvironment(env)
self.server.errorOccurred.connect(self.handle_process_errors)
self.server.setProcessChannelMode(QProcess.SeparateChannels)
if self.stdout_file and self.stderr_file:
self.server.setStandardOutputFile(self.stdout_file)
self.server.setStandardErrorFile(self.stderr_file)
self.server.start(server_args[0], server_args[1:])
self.color_scheme = self.get_conf('appearance', 'ui_theme')
self.theme = self.get_conf('appearance', 'selected')

Expand Down Expand Up @@ -302,10 +308,7 @@ def on_close(self, cancelable=False):
"""Perform actions before parent main window is closed."""
for term in self.terms:
term.close()
self.server.terminate()
if get_debug_level() > 0:
self.server_stdout.close()
self.server_stderr.close()
self.server.kill()
return True

def refresh_plugin(self):
Expand Down Expand Up @@ -432,6 +435,20 @@ def tab_name_editor(self):
index = self.tabwidget.currentIndex()
self.tabwidget.tabBar().tab_name_editor.edit_tab(index)

def handle_process_errors(self):
"""Handle when an error ocurrs in the server."""
QMessageBox.warning(
self,
_('Spyder Terminal Server Error'),
_("The server that creates terminals failed to start. Please "
"restart Spyder in a system terminal with the command spyder "
"--debug-info minimal and open an issue with the contents of "
"<tt>{0}</tt> and <tt>{1}</tt> files at {2}.").format(
osp.join(os.getcwd(), 'spyder_terminal_out.log'),
osp.join(os.getcwd(), 'spyder_terminal_err.log'),
self.URL_ISSUES),
QMessageBox.Ok)


def test():
"""Plugin visual test."""
Expand Down