PrEditor 0.2.0__py2.py3-none-any.whl → 0.4.0__py2.py3-none-any.whl

{PrEditor-0.2.0.dist-info → PrEditor-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PrEditor
-Version: 0.2.0
+Version: 0.4.0
 Summary: A python REPL and Editor and console based on Qt.
 Home-page: https://github.com/blurstudio/PrEditor.git
 Author: Blur Studio

{PrEditor-0.2.0.dist-info → PrEditor-0.4.0.dist-info}/RECORD

@@ -11,7 +11,7 @@ preditor/plugins.py,sha256=W3DfdDEE5DtEXOXioEyIe4tuIVV1V-RLcV8LoZJWpWU,1916
 preditor/prefs.py,sha256=BPtSsdv2yuiRpIaqEml9fxlVYKHNfqQ77hp5YIQRDBg,2172
 preditor/settings.py,sha256=DV9_DbJorEnhdIvW15E7h7PswlQUsy0UlA8bXUYN0og,2206
 preditor/streamhandler_helper.py,sha256=kiU6T9WqJ3JKTTKCa7IUU8brwK7zO5UUpEzLhEfKe44,1788
-preditor/version.py,sha256=g0RU_Fiae76hPEUjU6lGnapa9IZoqGcB4oFcTnsoMbM,142
+preditor/version.py,sha256=LXsVgL30inwYURXgt8agwHpCAGkWqXpMAmFq8N7WB4Q,142
 preditor/weakref.py,sha256=b--KomFAHcMWr3DEAIN2j3XxRhjDWKw0WABXyn1nxDg,12177
 preditor/cores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 preditor/cores/core.py,sha256=ZXB4bts05DMQtc-dtkk81chIWNqYXImMuWCYuUHwLdA,2389
@@ -28,13 +28,14 @@ preditor/gui/dialog.py,sha256=Vw8Wflb2P3TngO8b-2suWP6JKHBVHdbGgYiRDKzYRlQ,7488
 preditor/gui/drag_tab_bar.py,sha256=5J-BSKQzS6_WuYxxGqmnUJr6AriTAvwfVK7Q3p7knrM,7933
 preditor/gui/editor_chooser.py,sha256=v82SPuxPgai3XiRWi9ypT0aRkbV6_IrbfBoAljM9pRY,1986
 preditor/gui/errordialog.py,sha256=FZzSykNtqgTZ-CKEsLFXfcw_k8zwx7g_aMaHbpnq2xI,3110
-preditor/gui/find_files.py,sha256=eG935f9Xbh7F1M8IK7PKko84a37shoaoplQitPMv_-c,4116
+preditor/gui/find_files.py,sha256=vh19jY571Z4E9IWSL4VyYcNJWYXzwxBHzBOzxWjI9QM,4223
 preditor/gui/level_buttons.py,sha256=yPFIWKc0bgKLrP2XHyBqNuvvTnXZqGdtN_p27jSb1Og,11925
 preditor/gui/logger_window_handler.py,sha256=VTNhaoFUnConE3NHj9KaDZlVoifix8xCbCuN5Ozjz0M,1482
-preditor/gui/loggerwindow.py,sha256=_f7T6e04pFHF1MZQYE77JvAHUQnJ28TS7CPGizNS2yo,47589
+preditor/gui/loggerwindow.py,sha256=hSVNH36CL_zrHStNqfjN-uiXnMUYlWXt6an8meVfifE,47760
 preditor/gui/newtabwidget.py,sha256=5aCWn9xAl5h1oZACqVuEsOAbzKTS2RegrLI41gROC8A,1971
 preditor/gui/redmine_login_dialog.py,sha256=cMPBuecSZD5yjycNkMwHa1AbdwgGoyHvX8anIvWjEFo,1893
 preditor/gui/set_text_editor_path_dialog.py,sha256=6mbHAXEVQhaWyg0N67f54aZpd5fp6puGWzeM0tPepiU,2251
+preditor/gui/status_label.py,sha256=UUSw2HSi5u8PA6W0pIeiaBN_LzrsJwb_AZAaGXQXBY8,2397
 preditor/gui/window.py,sha256=bZAEKQDM6V4aew1nlSTPyq_tG-_IoSvyXHcZxrdFMaE,6924
 preditor/gui/workbox_mixin.py,sha256=4tUiOWRFc0tEOAAo9BDD3idlkfO6t4VCuL4tklYNnTY,12543
 preditor/gui/workbox_text_edit.py,sha256=fJY7eo1bpMyzLri5DfdVb2vad9znJjBvzLkY34T8gb4,3678
@@ -140,15 +141,15 @@ preditor/scintilla/lexers/mulexer.py,sha256=Y2FVp6ZJ9CgLIuIvItOzXMMRemuToID66dpB
 preditor/scintilla/lexers/pythonlexer.py,sha256=WgL74RQGvGgsdAL-l2ioOMybqRw7M0GG-SxmzXsW4xw,1682
 preditor/scintilla/ui/finddialog.ui,sha256=CEXouVKqVCDOfMBciK-89OmsGe2Kr6XdMbSPiffp0PA,4048
 preditor/stream/__init__.py,sha256=SxILA3U3W8aNfVBd_oJ4-WXkA214cl1zGLSCelFx5QU,2682
-preditor/stream/director.py,sha256=ymay-JYrw96MwLiR7DoFJ9af3BhTODJSoEPNnkivOuE,1915
+preditor/stream/director.py,sha256=Gklbl6jwTmB0BtyR6MZxRytdlufaz5MoiW9Le9WFTmo,2733
 preditor/stream/manager.py,sha256=NP4lf6hd5L_Ui-9Ws66gVEk6ZL8YqF7BxOzUsdrh3v0,2811
 preditor/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 preditor/utils/cute.py,sha256=LfF8gXMAkkQAdo4mm6J9aVkDLwWZbE6prQ0moDbtCys,1045
 preditor/utils/stylesheets.py,sha256=EVWZNq3WnaRiyUPoYMKQo_dLEwbRyKu26b03I1JDA-s,1622
 preditor/utils/text_search.py,sha256=21kuSDTpLIPUcriB81WP1kWfzuDBuP13ZtHUtypP5jE,14218
-PrEditor-0.2.0.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-PrEditor-0.2.0.dist-info/METADATA,sha256=3XtyKNBXmKiZ5nbUBpSZgT_RzSmyMollevrf_fp6GxU,9277
-PrEditor-0.2.0.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-PrEditor-0.2.0.dist-info/entry_points.txt,sha256=mpe0HFD_oIEBNPTJNyUEbmMV6Ivrp4EuYyZ34C5d_PU,519
-PrEditor-0.2.0.dist-info/top_level.txt,sha256=iX1_mrUOky_BQr2oG0l_MbEUYF6idyjiWSzu9z3irIw,9
-PrEditor-0.2.0.dist-info/RECORD,,
+PrEditor-0.4.0.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+PrEditor-0.4.0.dist-info/METADATA,sha256=uWRRXD5RnLauKw3NobDW8znh1VsatdJXz5PAa0M9itQ,9277
+PrEditor-0.4.0.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+PrEditor-0.4.0.dist-info/entry_points.txt,sha256=mpe0HFD_oIEBNPTJNyUEbmMV6Ivrp4EuYyZ34C5d_PU,519
+PrEditor-0.4.0.dist-info/top_level.txt,sha256=iX1_mrUOky_BQr2oG0l_MbEUYF6idyjiWSzu9z3irIw,9
+PrEditor-0.4.0.dist-info/RECORD,,

preditor/gui/find_files.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, print_function
 
 from Qt.QtCore import Qt
-from Qt.QtGui import QIcon
+from Qt.QtGui import QIcon, QKeySequence
 from Qt.QtWidgets import QApplication, QShortcut, QWidget
 
 from .. import resourcePath
@@ -30,17 +30,22 @@ class FindFiles(QWidget):
 
         # Create shortcuts
         self.uiCloseSCT = QShortcut(
-            Qt.Key_Escape, self, context=Qt.WidgetWithChildrenShortcut
+            QKeySequence(Qt.Key_Escape), self, context=Qt.WidgetWithChildrenShortcut
         )
+
         self.uiCloseSCT.activated.connect(self.hide)
 
         self.uiCaseSensitiveSCT = QShortcut(
-            Qt.AltModifier | Qt.Key_C, self, context=Qt.WidgetWithChildrenShortcut
+            QKeySequence(Qt.AltModifier | Qt.Key_C),
+            self,
+            context=Qt.WidgetWithChildrenShortcut,
         )
         self.uiCaseSensitiveSCT.activated.connect(self.uiCaseSensitiveBTN.toggle)
 
         self.uiRegexSCT = QShortcut(
-            Qt.AltModifier | Qt.Key_R, self, context=Qt.WidgetWithChildrenShortcut
+            QKeySequence(Qt.AltModifier | Qt.Key_R),
+            self,
+            context=Qt.WidgetWithChildrenShortcut,
         )
         self.uiRegexSCT.activated.connect(self.uiRegexBTN.toggle)
 

preditor/gui/loggerwindow.py

@@ -18,7 +18,6 @@ from Qt.QtGui import QCursor, QFont, QFontDatabase, QIcon, QTextCursor
 from Qt.QtWidgets import (
     QApplication,
     QInputDialog,
-    QLabel,
     QMessageBox,
     QTextBrowser,
     QToolTip,
@@ -44,6 +43,7 @@ from ..utils import stylesheets
 from .completer import CompleterMode
 from .level_buttons import LoggingLevelButton
 from .set_text_editor_path_dialog import SetTextEditorPathDialog
+from .status_label import StatusLabel
 
 
 class WorkboxPages:
@@ -84,7 +84,7 @@ class LoggerWindow(Window):
         self.uiConsoleTXT.uiClearToLastPromptACT.setShortcut('')
 
         # create the status reporting label
-        self.uiStatusLBL = QLabel(self)
+        self.uiStatusLBL = StatusLabel(self)
         self.uiMenuBar.setCornerWidget(self.uiStatusLBL)
 
         # create the workbox tabs
@@ -654,7 +654,8 @@ class LoggerWindow(Window):
 
     def reportExecutionTime(self, seconds):
         """Update status text with seconds passed in."""
-        self.setStatusText('Exec: {:0.04f} Seconds'.format(seconds))
+        self.uiStatusLBL.showSeconds(seconds)
+        self.uiMenuBar.adjustSize()
 
     def recordPrefs(self, manual=False):
         if not manual and not self.uiAutoSaveSettingssACT.isChecked():
@@ -681,6 +682,7 @@ class LoggerWindow(Window):
                 'uiAutoPromptACT': self.uiAutoPromptACT.isChecked(),
                 'uiLinesInNewWorkboxACT': self.uiLinesInNewWorkboxACT.isChecked(),
                 'uiErrorHyperlinksACT': self.uiErrorHyperlinksACT.isChecked(),
+                'uiStatusLbl_limit': self.uiStatusLBL.limit(),
                 'textEditorPath': self.textEditorPath,
                 'textEditorCmdTempl': self.textEditorCmdTempl,
                 'currentStyleSheet': self._stylesheet,
@@ -796,6 +798,7 @@ class LoggerWindow(Window):
             pref.get('uiLinesInNewWorkboxACT', False)
         )
         self.uiErrorHyperlinksACT.setChecked(pref.get('uiErrorHyperlinksACT', True))
+        self.uiStatusLBL.setLimit(pref.get('uiStatusLbl_limit', 5))
 
         # Find Files settings
         self.uiFindInWorkboxesWGT.uiRegexBTN.setChecked(
@@ -876,7 +879,7 @@ class LoggerWindow(Window):
 
     def clearStatusText(self):
         """Clear any displayed status text"""
-        self.uiStatusLBL.setText('')
+        self.uiStatusLBL.clear()
         self.uiMenuBar.adjustSize()
 
     def autoHideStatusText(self):

preditor/gui/status_label.py

@@ -0,0 +1,79 @@
+from __future__ import absolute_import
+
+from collections import deque
+
+from Qt.QtCore import QPoint, QTimer
+from Qt.QtWidgets import QInputDialog, QLabel, QMenu
+
+
+class StatusLabel(QLabel):
+    """A label that shows text and an average of code execution times in popup menu."""
+
+    def __init__(self, *args, limit=5, **kwargs):
+        self.render_as_href = False
+        super(StatusLabel, self).__init__(*args, **kwargs)
+        self.times = deque(maxlen=limit)
+
+    def clear(self):
+        self.setText("")
+
+    def clearTimes(self):
+        """"""
+        self.times.clear()
+
+    def chooseLimit(self):
+        limit, success = QInputDialog.getInt(
+            self,
+            "Choose Avg length",
+            "Choose how many execution time history to keep.",
+            value=self.limit(),
+            min=1,
+            max=100,
+        )
+        if limit:
+            self.setLimit(limit)
+
+    def mouseReleaseEvent(self, event):
+        QTimer.singleShot(0, self.showMenu)
+        super(StatusLabel, self).mouseReleaseEvent(event)
+
+    def secondsText(self, seconds):
+        """Generates text to show seconds of exec time."""
+        return 'Exec: {:0.04f} Seconds'.format(seconds)
+
+    def limit(self):
+        return self.times.maxlen
+
+    def setLimit(self, limit):
+        self.times = deque(self.times, maxlen=limit)
+
+    def setText(self, text):
+        if self.render_as_href:
+            text = '<a href="showMenu">{}</a>'.format(text)
+        super(StatusLabel, self).setText(text)
+
+    def showSeconds(self, seconds):
+        self.times.append(seconds)
+        self.setText(self.secondsText(seconds))
+
+    def showMenu(self):
+        menu = QMenu(self)
+        if self.times:
+            # Show the time it took to run the last X code calls
+            for seconds in self.times:
+                menu.addAction(self.secondsText(seconds))
+
+            menu.addSeparator()
+            avg = sum(self.times) / len(self.times)
+            menu.addAction("Average: {:0.04f}s".format(avg))
+            act = menu.addAction("Clear")
+            act.triggered.connect(self.clearTimes)
+
+        menu.addSeparator()
+        act = menu.addAction("Set limit...")
+        act.triggered.connect(self.chooseLimit)
+
+        # Position the menu at the bottom of the widget
+        height = self.geometry().height()
+        pos = self.mapToGlobal(QPoint(0, height))
+        menu.popup(pos)

preditor/stream/director.py

@@ -28,17 +28,34 @@ class Director(io.TextIOBase):
         self.manager = manager
         self.state = state
 
+        # Keep track of whether we wrapped a std stream
+        # that way we don't .close() any streams that we don't control
+        self.std_stream_wrapped = False
+
         if old_stream is False:
             old_stream = None
         elif old_stream is None:
             if state == STDOUT:
-                old_stream = sys.stdout
+                # On Windows if we're in pythonw.exe, then sys.stdout is named "nul"
+                # And it uses cp1252 encoding (which breaks with unicode)
+                # So if we find this nul TextIOWrapper, it's safe to just skip it
+                if getattr(sys.stdout, 'name', '') != 'nul':
+                    self.std_stream_wrapped = True
+                    old_stream = sys.stdout
             elif state == STDERR:
-                old_stream = sys.stderr
+                if getattr(sys.stderr, 'name', '') != 'nul':
+                    self.std_stream_wrapped = True
+                    old_stream = sys.stderr
+
         self.old_stream = old_stream
 
     def close(self):
-        if self.old_stream:
+        if (
+            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__
+        ):
             self.old_stream.close()
 
         super(Director, self).close()

preditor/version.py

@@ -1,5 +1,5 @@
 # coding: utf-8
 # file generated by setuptools_scm
 # don't change, don't track in version control
-version = '0.2.0'
-version_tuple = (0, 2, 0)
+version = '0.4.0'
+version_tuple = (0, 4, 0)