PrEditor 2.6.0__tar.gz → 2.8.0__tar.gz

{preditor-2.6.0 → preditor-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 2.6.0
+Version: 2.8.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0

{preditor-2.6.0 → preditor-2.8.0}/PrEditor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PrEditor
-Version: 2.6.0
+Version: 2.8.0
 Summary: A python REPL and Editor and console based on Qt.
 Author-email: Blur Studio <opensource@blur.com>
 License: LGPL-3.0

{preditor-2.6.0 → preditor-2.8.0}/PrEditor.egg-info/SOURCES.txt

@@ -24,6 +24,8 @@ PrEditor.egg-info/SOURCES.txt
 PrEditor.egg-info/dependency_links.txt
 PrEditor.egg-info/entry_points.txt
 PrEditor.egg-info/requires.txt
+PrEditor.egg-info/scm_file_list.json
+PrEditor.egg-info/scm_version.json
 PrEditor.egg-info/top_level.txt
 examples/add_to_app.py
 examples/output_capture_and_show.py

preditor-2.8.0/PrEditor.egg-info/scm_file_list.json

@@ -0,0 +1,221 @@
+{
+  "files": [
+    ".coveragerc",
+    ".github/ISSUE_TEMPLATE/BUG_REPORT.md",
+    ".github/ISSUE_TEMPLATE/FEATURE_REQUEST.md",
+    ".github/PULL_REQUEST_TEMPLATE.md",
+    ".github/workflows/release.yml",
+    ".github/workflows/static-analysis-and-test.yml",
+    ".gitignore",
+    ".pre-commit-config.yaml",
+    "CODE_OF_CONDUCT.md",
+    "CONTRIBUTING.md",
+    "LICENSE",
+    "MANIFEST.in",
+    "README.md",
+    "examples/add_to_app.py",
+    "examples/output_capture_and_show.py",
+    "examples/output_console.py",
+    "examples/output_console.ui",
+    "preditor/__init__.py",
+    "preditor/__main__.py",
+    "preditor/about_module.py",
+    "preditor/cli.py",
+    "preditor/config.py",
+    "preditor/constants.py",
+    "preditor/contexts.py",
+    "preditor/cores/__init__.py",
+    "preditor/cores/core.py",
+    "preditor/dccs/.hab.json",
+    "preditor/dccs/maya/PrEditor_maya.mod",
+    "preditor/dccs/maya/README.md",
+    "preditor/dccs/maya/plug-ins/PrEditor_maya.py",
+    "preditor/dccs/studiomax/PackageContents.xml",
+    "preditor/dccs/studiomax/PrEditor-PrEditor_Show.mcr",
+    "preditor/dccs/studiomax/README.md",
+    "preditor/dccs/studiomax/preditor.ms",
+    "preditor/dccs/studiomax/preditor_menu.mnx",
+    "preditor/debug.py",
+    "preditor/delayable_engine/__init__.py",
+    "preditor/delayable_engine/delayables.py",
+    "preditor/enum.py",
+    "preditor/excepthooks.py",
+    "preditor/gui/__init__.py",
+    "preditor/gui/app.py",
+    "preditor/gui/codehighlighter.py",
+    "preditor/gui/completer.py",
+    "preditor/gui/console.py",
+    "preditor/gui/console_base.py",
+    "preditor/gui/dialog.py",
+    "preditor/gui/drag_tab_bar.py",
+    "preditor/gui/editor_chooser.py",
+    "preditor/gui/errordialog.py",
+    "preditor/gui/find_files.py",
+    "preditor/gui/fuzzy_search/__init__.py",
+    "preditor/gui/fuzzy_search/fuzzy_search.py",
+    "preditor/gui/group_tab_widget/__init__.py",
+    "preditor/gui/group_tab_widget/group_tab_widget.py",
+    "preditor/gui/group_tab_widget/grouped_tab_menu.py",
+    "preditor/gui/group_tab_widget/grouped_tab_models.py",
+    "preditor/gui/group_tab_widget/grouped_tab_widget.py",
+    "preditor/gui/group_tab_widget/one_tab_widget.py",
+    "preditor/gui/level_buttons.py",
+    "preditor/gui/logger_window_handler.py",
+    "preditor/gui/logger_window_plugin.py",
+    "preditor/gui/loggerwindow.py",
+    "preditor/gui/newtabwidget.py",
+    "preditor/gui/output_console.py",
+    "preditor/gui/qtdesigner/__init__.py",
+    "preditor/gui/qtdesigner/_log_plugin.py",
+    "preditor/gui/qtdesigner/console_base_plugin.py",
+    "preditor/gui/qtdesigner/console_predit_plugin.py",
+    "preditor/gui/set_text_editor_path_dialog.py",
+    "preditor/gui/status_label.py",
+    "preditor/gui/suggest_path_quotes_dialog.py",
+    "preditor/gui/ui/editor_chooser.ui",
+    "preditor/gui/ui/errordialog.ui",
+    "preditor/gui/ui/find_files.ui",
+    "preditor/gui/ui/loggerwindow.ui",
+    "preditor/gui/ui/set_text_editor_path_dialog.ui",
+    "preditor/gui/ui/suggest_path_quotes_dialog.ui",
+    "preditor/gui/window.py",
+    "preditor/gui/workbox_mixin.py",
+    "preditor/gui/workbox_text_edit.py",
+    "preditor/gui/workboxwidget.py",
+    "preditor/logging_config.py",
+    "preditor/osystem.py",
+    "preditor/plugins.py",
+    "preditor/prefs.py",
+    "preditor/resource/error_mail.html",
+    "preditor/resource/error_mail_inline.html",
+    "preditor/resource/img/README.md",
+    "preditor/resource/img/arrow_forward.png",
+    "preditor/resource/img/check-bold.png",
+    "preditor/resource/img/chevron-down.png",
+    "preditor/resource/img/chevron-up.png",
+    "preditor/resource/img/close-thick.png",
+    "preditor/resource/img/comment-edit.png",
+    "preditor/resource/img/content-copy.png",
+    "preditor/resource/img/content-cut.png",
+    "preditor/resource/img/content-duplicate.png",
+    "preditor/resource/img/content-paste.png",
+    "preditor/resource/img/content-save.png",
+    "preditor/resource/img/debug_disabled.png",
+    "preditor/resource/img/eye-check.png",
+    "preditor/resource/img/file-plus.png",
+    "preditor/resource/img/file-remove.png",
+    "preditor/resource/img/format-align-left.png",
+    "preditor/resource/img/format-letter-case-lower.png",
+    "preditor/resource/img/format-letter-case-upper.png",
+    "preditor/resource/img/format-letter-case.svg",
+    "preditor/resource/img/information.png",
+    "preditor/resource/img/logging_critical.png",
+    "preditor/resource/img/logging_custom.png",
+    "preditor/resource/img/logging_debug.png",
+    "preditor/resource/img/logging_error.png",
+    "preditor/resource/img/logging_info.png",
+    "preditor/resource/img/logging_not_set.png",
+    "preditor/resource/img/logging_warning.png",
+    "preditor/resource/img/marker.png",
+    "preditor/resource/img/play.png",
+    "preditor/resource/img/playlist-play.png",
+    "preditor/resource/img/plus-minus-variant.png",
+    "preditor/resource/img/preditor.ico",
+    "preditor/resource/img/preditor.png",
+    "preditor/resource/img/preditor.psd",
+    "preditor/resource/img/preditor.svg",
+    "preditor/resource/img/regex.svg",
+    "preditor/resource/img/restart.svg",
+    "preditor/resource/img/skip-forward-outline.png",
+    "preditor/resource/img/skip-next-outline.png",
+    "preditor/resource/img/skip-next.png",
+    "preditor/resource/img/skip-previous.png",
+    "preditor/resource/img/subdirectory-arrow-right.png",
+    "preditor/resource/img/text-search-variant.png",
+    "preditor/resource/img/warning-big.png",
+    "preditor/resource/lang/python.json",
+    "preditor/resource/pref_updates/pref_updates.json",
+    "preditor/resource/settings.ini",
+    "preditor/resource/stylesheet/Bright.css",
+    "preditor/resource/stylesheet/Dark.css",
+    "preditor/scintilla/__init__.py",
+    "preditor/scintilla/delayables/__init__.py",
+    "preditor/scintilla/delayables/smart_highlight.py",
+    "preditor/scintilla/delayables/spell_check.py",
+    "preditor/scintilla/documenteditor.py",
+    "preditor/scintilla/finddialog.py",
+    "preditor/scintilla/lang/__init__.py",
+    "preditor/scintilla/lang/config/bash.ini",
+    "preditor/scintilla/lang/config/batch.ini",
+    "preditor/scintilla/lang/config/cpp.ini",
+    "preditor/scintilla/lang/config/css.ini",
+    "preditor/scintilla/lang/config/eyeonscript.ini",
+    "preditor/scintilla/lang/config/html.ini",
+    "preditor/scintilla/lang/config/javascript.ini",
+    "preditor/scintilla/lang/config/lua.ini",
+    "preditor/scintilla/lang/config/maxscript.ini",
+    "preditor/scintilla/lang/config/mel.ini",
+    "preditor/scintilla/lang/config/mu.ini",
+    "preditor/scintilla/lang/config/nsi.ini",
+    "preditor/scintilla/lang/config/perl.ini",
+    "preditor/scintilla/lang/config/puppet.ini",
+    "preditor/scintilla/lang/config/python.ini",
+    "preditor/scintilla/lang/config/ruby.ini",
+    "preditor/scintilla/lang/config/sql.ini",
+    "preditor/scintilla/lang/config/xml.ini",
+    "preditor/scintilla/lang/config/yaml.ini",
+    "preditor/scintilla/lang/language.py",
+    "preditor/scintilla/lexers/__init__.py",
+    "preditor/scintilla/lexers/cpplexer.py",
+    "preditor/scintilla/lexers/javascriptlexer.py",
+    "preditor/scintilla/lexers/maxscriptlexer.py",
+    "preditor/scintilla/lexers/mellexer.py",
+    "preditor/scintilla/lexers/mulexer.py",
+    "preditor/scintilla/lexers/pythonlexer.py",
+    "preditor/scintilla/ui/finddialog.ui",
+    "preditor/settings.py",
+    "preditor/stream/__init__.py",
+    "preditor/stream/console_handler.py",
+    "preditor/stream/director.py",
+    "preditor/stream/manager.py",
+    "preditor/streamhandler_helper.py",
+    "preditor/utils/__init__.py",
+    "preditor/utils/call_stack.py",
+    "preditor/utils/cute.py",
+    "preditor/utils/stylesheets.py",
+    "preditor/utils/text_search.py",
+    "preditor/weakref.py",
+    "pyproject.toml",
+    "requirements-cli.txt",
+    "requirements-dev.txt",
+    "requirements-qsci5.txt",
+    "requirements-qsci6.txt",
+    "requirements-shortcut.txt",
+    "requirements.txt",
+    "tests/conftest.py",
+    "tests/encodings/a_utf-8.txt",
+    "tests/encodings/b_utf-8.txt",
+    "tests/encodings/test_ecoding.py",
+    "tests/find_files/re_greedy_False_0_True.md",
+    "tests/find_files/re_greedy_False_2_True.md",
+    "tests/find_files/re_greedy_True_2_True.md",
+    "tests/find_files/re_greedy_upper_True_2_True.md",
+    "tests/find_files/re_simple_False_0_True.md",
+    "tests/find_files/re_simple_False_2_True.md",
+    "tests/find_files/re_simple_False_3_True.md",
+    "tests/find_files/re_simple_True_2_True.md",
+    "tests/find_files/simple_False_0_False.md",
+    "tests/find_files/simple_False_1_False.md",
+    "tests/find_files/simple_False_2_False.md",
+    "tests/find_files/simple_False_3_False.md",
+    "tests/find_files/simple_True_2_False.md",
+    "tests/find_files/tab_text.txt",
+    "tests/find_files/test_find_files.py",
+    "tests/ide/test_delayable_engine.py",
+    "tests/test_config.py",
+    "tests/test_cute.py",
+    "tests/test_prefs.py",
+    "tests/test_stream.py",
+    "tox.ini"
+  ]
+}

preditor-2.8.0/PrEditor.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.8.0",
+  "distance": 0,
+  "node": "ge6dd558d24b9e26fa7b9276b7fba723b31a1558a",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-17"
+}

{preditor-2.6.0 → preditor-2.8.0}/preditor/gui/completer.py

@@ -5,8 +5,7 @@ import re
 import sys
 from enum import Enum
 
-import Qt as Qt_py
-from Qt.QtCore import QRegExp, QSortFilterProxyModel, QStringListModel, Qt
+from Qt.QtCore import QRegularExpression, QSortFilterProxyModel, QStringListModel, Qt
 from Qt.QtGui import QCursor, QTextCursor
 from Qt.QtWidgets import QCompleter, QToolTip
 
@@ -160,14 +159,12 @@ class PythonCompleter(QCompleter):
         if self._completerMode == CompleterMode.FULL_FUZZY:
             regExStr = ".*".join(prefix)
 
-        if Qt_py.IsPyQt6 or Qt_py.IsPySide6:
-            regexp = QRegExp(regExStr)
-            if self._sensitivity:
-                regexp.setPatternOptions(QRegExp.PatternOption.CaseInsensitiveOption)
-            self.filterModel.setFilterRegularExpression(regexp)
-        else:
-            regexp = QRegExp(regExStr, self._sensitivity)
-            self.filterModel.setFilterRegExp(regexp)
+        regexp = QRegularExpression(regExStr)
+        if self._sensitivity == Qt.CaseSensitivity.CaseInsensitive:
+            regexp.setPatternOptions(
+                QRegularExpression.PatternOption.CaseInsensitiveOption
+            )
+        self.filterModel.setFilterRegularExpression(regexp)
 
     def clear(self):
         self.popup().hide()

{preditor-2.6.0 → preditor-2.8.0}/preditor/gui/console_base.py

@@ -18,6 +18,7 @@ from Qt.QtGui import (
     QTextCursor,
 )
 from Qt.QtWidgets import QAction, QApplication, QTextEdit, QWidget
+from Qt.QtCompat import QMouseEvent
 
 from .. import instance, resourcePath, stream
 from ..constants import StreamType
@@ -136,6 +137,7 @@ class ConsoleBase(QTextEdit):
     def contextMenuEvent(self, event):
         """Builds a custom right click menu to show."""
         # Create the standard menu and allow subclasses to customize it
+        # The event.pos method for QContextMenuEvent was NOT removed
         menu = self.createStandardContextMenu(event.pos())
         menu = self.update_context_menu(menu)
         if self.controller:
@@ -432,7 +434,8 @@ class ConsoleBase(QTextEdit):
         """Overload of mousePressEvent to change mouse pointer to indicate it is
         over a clickable error hyperlink.
         """
-        if self.anchorAt(event.pos()):
+        pos = QMouseEvent.position(event).toPoint()
+        if self.anchorAt(pos):
             self.viewport().setCursor(Qt.CursorShape.PointingHandCursor)
         else:
             self.viewport().unsetCursor()
@@ -444,8 +447,9 @@ class ConsoleBase(QTextEdit):
         select text), we check if user clicked an error hyperlink.
         """
         left = event.button() == Qt.MouseButton.LeftButton
-        anchor = self.anchorAt(event.pos())
-        self.mousePressPos = event.pos()
+        pos = QMouseEvent.position(event).toPoint()
+        anchor = self.anchorAt(pos)
+        self.mousePressPos = pos
 
         if left and anchor:
             event.ignore()
@@ -457,9 +461,10 @@ class ConsoleBase(QTextEdit):
         """Overload of mouseReleaseEvent to capture if user has left clicked... Check if
         click position is the same as release position, if so, call errorHyperlink.
         """
-        samePos = event.pos() == self.mousePressPos
+        pos = QMouseEvent.position(event).toPoint()
+        samePos = pos == self.mousePressPos
         left = event.button() == Qt.MouseButton.LeftButton
-        anchor = self.anchorAt(event.pos())
+        anchor = self.anchorAt(pos)
 
         if samePos and left and anchor:
             self.errorHyperlink(anchor)

{preditor-2.6.0 → preditor-2.8.0}/preditor/gui/drag_tab_bar.py

@@ -14,6 +14,7 @@ from Qt.QtWidgets import (
     QSizePolicy,
     QTabBar,
 )
+from Qt.QtCompat import QMouseEvent, QDragMoveEvent
 
 from preditor import osystem
 
@@ -236,7 +237,8 @@ class DragTabBar(QTabBar):
 
         # Check if the mouse has moved outside of the widget, if not, let
         # the QTabBar handle the internal tab movement.
-        event_pos = event.pos()
+
+        event_pos = QMouseEvent.position(event).toPoint()
         global_pos = self.mapToGlobal(event_pos)
         bar_geo = QRect(self.mapToGlobal(self.pos()), self.size())
         inside = bar_geo.contains(global_pos)
@@ -268,7 +270,8 @@ class DragTabBar(QTabBar):
 
     def mousePressEvent(self, event):  # noqa: N802
         if event.button() == Qt.MouseButton.LeftButton and not self._mime_data:
-            tab_index = self.tabAt(event.pos())
+            pos = QMouseEvent.position(event).toPoint()
+            tab_index = self.tabAt(pos)
 
             # While we don't remove the tab on mouse press, capture its tab image
             # and attach it to the mouse. This also stores info needed to handle
@@ -312,7 +315,8 @@ class DragTabBar(QTabBar):
         # the current tab so users can easily drop inside that tab.
         if not event.mimeData().hasFormat(self.mime_type):
             event.accept()
-            tab_index = self.tabAt(event.pos())
+            pos = QDragMoveEvent().position(event).toPoint()
+            tab_index = self.tabAt(pos)
             if tab_index == -1:
                 tab_index = self.count() - 1
             if self.currentIndex() != tab_index:

{preditor-2.6.0 → preditor-2.8.0}/preditor/gui/loggerwindow.py

@@ -311,7 +311,7 @@ class LoggerWindow(Window):
 
         # Tooltips - Qt4 doesn't have a ToolTipsVisible method, so we fake it
         regEx = ".*"
-        menus = self.findChildren(QtWidgets.QMenu, QtCore.QRegExp(regEx))
+        menus = self.findChildren(QtWidgets.QMenu, QtCore.QRegularExpression(regEx))
         for menu in menus:
             menu.hovered.connect(handleMenuHovered)
 

{preditor-2.6.0 → preditor-2.8.0}/preditor/gui/workbox_mixin.py

@@ -655,7 +655,9 @@ class WorkboxMixin(object):
             # Save the file to disk
             try:
                 txt = self.__text__()
-                self.__write_file__(filename, txt, encoding=self._encoding)
+                self.__write_file__(
+                    filename, txt, encoding=self._encoding, toUnixEOL=False
+                )
                 self.__set_filename__(filename)
                 self.__set_last_workbox_name__(self.__workbox_name__())
                 self.__set_last_saved_text__(txt)

{preditor-2.6.0 → preditor-2.8.0}/preditor/gui/workboxwidget.py

@@ -285,7 +285,7 @@ class WorkboxWidget(WorkboxMixin, DocumentEditor):
         # refresh the search text unless we are using regular expressions
         if (
             not self._searchDialog.isVisible()
-            and not self._searchFlags & SearchOptions.QRegExp
+            and not self._searchFlags & SearchOptions.Regex
         ):
             txt = self.selectedText()
             if txt:

{preditor-2.6.0 → preditor-2.8.0}/preditor/scintilla/documenteditor.py

@@ -49,7 +49,7 @@ class SearchOptions(EnumGroup):
     Backward = Enum()
     CaseSensitive = Enum()
     WholeWords = Enum()
-    QRegExp = Enum()
+    Regex = Enum()
 
 
 @contextmanager
@@ -640,7 +640,7 @@ class DocumentEditor(QsciScintilla):
             window.uiLanguageDDL.blockSignals(False)
 
     def lineMarginWidth(self):
-        return self.marginWidth(self.SymbolMargin)
+        return self.marginWidth(QsciScintilla.MarginType.SymbolMargin)
 
     def filename(self):
         return self._filename
@@ -649,7 +649,7 @@ class DocumentEditor(QsciScintilla):
         self._filename = filename
 
     def findNext(self, text, flags):
-        re = (flags & SearchOptions.QRegExp) != 0
+        re = (flags & SearchOptions.Regex) != 0
         cs = (flags & SearchOptions.CaseSensitive) != 0
         wo = (flags & SearchOptions.WholeWords) != 0
         wrap = True
@@ -663,7 +663,7 @@ class DocumentEditor(QsciScintilla):
         return result
 
     def findPrev(self, text, flags):
-        re = (flags & SearchOptions.QRegExp) != 0
+        re = (flags & SearchOptions.Regex) != 0
         cs = (flags & SearchOptions.CaseSensitive) != 0
         wo = (flags & SearchOptions.WholeWords) != 0
         wrap = True
@@ -932,14 +932,14 @@ class DocumentEditor(QsciScintilla):
         in the file.
         """
         for line in input:
-            marker = self.markerDefine(self.Circle)
+            marker = self.markerDefine(QsciScintilla.MarkerSymbol.Circle)
             self.markerAdd(line, marker)
 
     def markerToggle(self):
         line, index = self.getCursorPosition()
         markers = self.markersAtLine(line)
         if not markers:
-            marker = self.markerDefine(self.Circle)
+            marker = self.markerDefine(QsciScintilla.MarkerSymbol.Circle)
             self.markerAdd(line, marker)
         else:
             self.markerDelete(line)
@@ -1147,7 +1147,7 @@ class DocumentEditor(QsciScintilla):
         )
 
     def setLineMarginWidth(self, width):
-        self.setMarginWidth(self.SymbolMargin, width)
+        self.setMarginWidth(QsciScintilla.MarginType.SymbolMargin, width)
 
     def setMarginsFont(self, font):
         super(DocumentEditor, self).setMarginsFont(font)
@@ -1200,12 +1200,12 @@ class DocumentEditor(QsciScintilla):
 
     def setShowFolding(self, state):
         if state:
-            self.setFolding(self.BoxedTreeFoldStyle)
+            self.setFolding(QsciScintilla.FoldStyle.BoxedTreeFoldStyle)
         else:
-            self.setFolding(self.NoFoldStyle)
+            self.setFolding(QsciScintilla.FoldStyle.NoFoldStyle)
 
     def setShowLineNumbers(self, state):
-        self.setMarginLineNumbers(self.SymbolMargin, state)
+        self.setMarginLineNumbers(QsciScintilla.MarginType.SymbolMargin, state)
 
     def setShowSmartHighlighting(self, state):
         self.delayable_engine.set_delayable_enabled('smart_highlight', state)
@@ -1459,10 +1459,10 @@ class DocumentEditor(QsciScintilla):
         self.updateColorScheme()
 
     def showFolding(self):
-        return self.folding() != self.NoFoldStyle
+        return self.folding() != QsciScintilla.FoldStyle.NoFoldStyle
 
     def showLineNumbers(self):
-        return self.marginLineNumbers(self.SymbolMargin)
+        return self.marginLineNumbers(QsciScintilla.MarginType.SymbolMargin)
 
     def showSmartHighlighting(self):
         return self.delayable_engine.delayable_enabled('smart_highlight')

{preditor-2.6.0 → preditor-2.8.0}/preditor/scintilla/finddialog.py

@@ -16,13 +16,13 @@ class FindDialog(Dialog):
         self.uiFindWholeWordsCHK.setChecked(
             parent.searchFlags() & SearchOptions.WholeWords
         )
-        self.uiQRegExpCHK.setChecked(parent.searchFlags() & SearchOptions.QRegExp)
+        self.uiRegexCHK.setChecked(parent.searchFlags() & SearchOptions.Regex)
         self.uiSearchTXT.setPlainText(parent.searchText())
 
         # update the signals
         self.uiCaseSensitiveCHK.clicked.connect(self.updateSearchTerms)
         self.uiFindWholeWordsCHK.clicked.connect(self.updateSearchTerms)
-        self.uiQRegExpCHK.clicked.connect(self.updateSearchTerms)
+        self.uiRegexCHK.clicked.connect(self.updateSearchTerms)
         self.uiSearchTXT.textChanged.connect(self.updateSearchTerms)
 
         self.uiFindNextBTN.clicked.connect(parent.uiFindNextACT.triggered.emit)
@@ -61,8 +61,8 @@ class FindDialog(Dialog):
             options |= SearchOptions.CaseSensitive
         if self.uiFindWholeWordsCHK.isChecked():
             options |= SearchOptions.WholeWords
-        if self.uiQRegExpCHK.isChecked():
-            options |= SearchOptions.QRegExp
+        if self.uiRegexCHK.isChecked():
+            options |= SearchOptions.Regex
 
         parent.setSearchFlags(options)
         parent.setSearchText(self.uiSearchTXT.toPlainText())

{preditor-2.6.0 → preditor-2.8.0}/preditor/scintilla/ui/finddialog.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>436</width>
+    <width>421</width>
     <height>170</height>
    </rect>
   </property>
@@ -115,12 +115,12 @@
     </widget>
    </item>
    <item row="3" column="2">
-    <widget class="QCheckBox" name="uiQRegExpCHK">
+    <widget class="QCheckBox" name="uiRegexCHK">
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use Qt's QRegExp engine to find using regular expressions instead of a plain text find.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Find using regular expressions instead of plain text.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
-      <string>QRegExp</string>
+      <string>Regex</string>
      </property>
     </widget>
    </item>
@@ -135,7 +135,7 @@
   <tabstop>uiFindPrevBTN</tabstop>
   <tabstop>uiFindWholeWordsCHK</tabstop>
   <tabstop>uiCaseSensitiveCHK</tabstop>
-  <tabstop>uiQRegExpCHK</tabstop>
+  <tabstop>uiRegexCHK</tabstop>
   <tabstop>uiCloseBTN</tabstop>
  </tabstops>
  <resources/>

{preditor-2.6.0 → preditor-2.8.0}/preditor/stream/director.py

@@ -6,6 +6,28 @@ import sys
 from ..constants import StreamType
 
 
+def _open_stream(stream):
+    """Returns stream if it is still usable, otherwise None.
+
+    The old_stream a Director wraps may be closed before the Director is. For
+    example pytest closes its capture files at the end of a test run. Using a
+    closed stream raises ``ValueError: I/O operation on closed file``, so treat
+    a closed stream the same as not having an old_stream at all.
+
+    Note: It's possible the stream is closed after this call so its recommended to
+    use a try/except ValueError when accessing the returned stream.
+    """
+    if stream is None:
+        return None
+    try:
+        if stream.closed:
+            return None
+    except (AttributeError, ValueError):
+        # Not all file like objects implement closed, assume it's usable.
+        pass
+    return stream
+
+
 class _DirectorBuffer(io.RawIOBase):
     """Binary buffer that forwards text writes to the manager.
 
@@ -32,8 +54,9 @@ class _DirectorBuffer(io.RawIOBase):
         self.name = name
 
     def flush(self):
-        if self.old_stream:
-            self.old_stream.flush()
+        old_stream = _open_stream(self.old_stream)
+        if old_stream:
+            old_stream.flush()
         super().flush()
 
     def writable(self):
@@ -47,8 +70,9 @@ class _DirectorBuffer(io.RawIOBase):
         msg = b.decode("utf-8", errors="replace")
         self.manager.write(msg, self.state)
 
-        if self.old_stream:
-            self.old_stream.write(msg)
+        old_stream = _open_stream(self.old_stream)
+        if old_stream:
+            old_stream.write(msg)
 
         return len(b)
 
@@ -115,7 +139,7 @@ class Director(io.TextIOWrapper):
 
     def close(self):
         if (
-            self.old_stream
+            _open_stream(self.old_stream)
             and not self.std_stream_wrapped
             and self.old_stream is not sys.__stdout__
             and self.old_stream is not sys.__stderr__
@@ -131,18 +155,31 @@ class Director(io.TextIOWrapper):
 
     # These methods enable terminal features like color coding etc.
     def isatty(self):
-        if self.old_stream is not None:
-            return self.old_stream.isatty()
+        old_stream = _open_stream(self.old_stream)
+        if old_stream is not None:
+            try:
+                return old_stream.isatty()
+            except ValueError:
+                # The stream was closed after we checked it
+                return False
         return False
 
     @property
     def encoding(self):
-        if self.old_stream is not None:
-            return self.old_stream.encoding
+        old_stream = _open_stream(self.old_stream)
+        if old_stream is not None:
+            try:
+                return old_stream.encoding
+            except ValueError:
+                pass
         return super().encoding
 
     @property
     def errors(self):
-        if self.old_stream is not None:
-            return self.old_stream.errors
+        old_stream = _open_stream(self.old_stream)
+        if old_stream is not None:
+            try:
+                return old_stream.errors
+            except ValueError:
+                pass
         return super().errors