-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14025 from impact27/std_files
PR: Fix handling of kernel stderr, and capture stdout and segfaults too (IPython console)
- Loading branch information
Showing
6 changed files
with
363 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # ----------------------------------------------------------------------------- | ||
| # Copyright (c) 2009- Spyder Project Contributors | ||
| # | ||
| # Distributed under the terms of the MIT License | ||
| # (see spyder/__init__.py for details) | ||
| # ----------------------------------------------------------------------------- | ||
| """ | ||
| Class to control a file where stanbdard output can be written. | ||
| """ | ||
| # Standard library imports. | ||
| import codecs | ||
| import os | ||
|
|
||
| # Local imports | ||
| from spyder.py3compat import to_text_string | ||
| from spyder.utils.encoding import get_coding | ||
|
|
||
|
|
||
| class StdFile(): | ||
| def __init__(self, filename): | ||
| self.filename = filename | ||
| self._mtime = 0 | ||
| self._cursor = 0 | ||
| self._handle = None | ||
|
|
||
| @property | ||
| def handle(self): | ||
| """Get handle to file.""" | ||
| if self._handle is None and self.filename is not None: | ||
| # Needed to prevent any error that could appear. | ||
| # See spyder-ide/spyder#6267. | ||
| try: | ||
| self._handle = codecs.open( | ||
| self.filename, 'w', encoding='utf-8') | ||
| except Exception: | ||
| pass | ||
| return self._handle | ||
|
|
||
| def remove(self): | ||
| """Remove file associated with the client.""" | ||
| try: | ||
| # Defer closing the handle until the client | ||
| # is closed because jupyter_client needs it open | ||
| # while it tries to restart the kernel | ||
| if self._handle is not None: | ||
| self._handle.close() | ||
| os.remove(self.filename) | ||
| self._handle = None | ||
| except Exception: | ||
| pass | ||
|
|
||
| def get_contents(self): | ||
| """Get the contents of the std kernel file.""" | ||
| try: | ||
| with open(self.filename, 'rb') as f: | ||
| # We need to read the file as bytes to be able to | ||
| # detect its encoding with chardet | ||
| text = f.read() | ||
|
|
||
| # This is needed to avoid showing an empty error message | ||
| # when the kernel takes too much time to start. | ||
| # See spyder-ide/spyder#8581. | ||
| if not text: | ||
| return '' | ||
|
|
||
| # This is needed since the file could be encoded | ||
| # in something different to utf-8. | ||
| # See spyder-ide/spyder#4191. | ||
| encoding = get_coding(text) | ||
| text = to_text_string(text, encoding) | ||
| return text | ||
| except Exception: | ||
| return None | ||
|
|
||
| def poll_file_change(self): | ||
| """Check if the std kernel file just changed.""" | ||
| if self._handle is not None and not self._handle.closed: | ||
| self._handle.flush() | ||
| try: | ||
| mtime = os.stat(self.filename).st_mtime | ||
| except Exception: | ||
| return | ||
|
|
||
| if mtime == self._mtime: | ||
| return | ||
| self._mtime = mtime | ||
| text = self.get_contents() | ||
| if text: | ||
| ret_text = text[self._cursor:] | ||
| self._cursor = len(text) | ||
| return ret_text |
Oops, something went wrong.