eric: comparison eric6/QScintilla/Shell.py

-:babe80d84a3e
+:7eb04391adf7
 """
 Module implementing a graphical Python shell.
 """
-from __future__ import unicode_literals
 import sys
 import re
 try:
 except ImportError:
 from ThirdParty.enum import Enum
 from PyQt5.QtCore import pyqtSignal, QFileInfo, Qt, QEvent
 from PyQt5.QtGui import QClipboard, QPalette, QFont
-from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu, \
+from PyQt5.QtWidgets import (
-QWidget, QHBoxLayout, QVBoxLayout, QShortcut, QSizePolicy
+QDialog, QInputDialog, QApplication, QMenu, QWidget, QHBoxLayout,
+QVBoxLayout, QShortcut, QSizePolicy
+)
 from PyQt5.Qsci import QsciScintilla
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 from .QsciScintillaCompat import QsciScintillaCompat
 import Preferences
 import Utilities
-from Globals import qVersionTuple
 import UI.PixmapCache
 from Debugger.DebugClientCapabilities import HasCompleter
 QsciScintilla.SCI_LINEENDEXTEND: self.extendSelectionToEOL,
 QsciScintilla.SCI_CANCEL: self.__QScintillaCancel,
 }
-self.__historyNavigateByCursor = \
+self.__historyNavigateByCursor = (
 Preferences.getShell("HistoryNavigateByCursor")
+)
 self.__queuedText = ''
 self.__blockTextProcessing = False
 self.queueText.connect(self.__concatenateText, Qt.QueuedConnection)
 Preferences.getEditorColour("CallTipsBackground"))
 self.setCallTipsVisible(Preferences.getEditor("CallTipsVisible"))
 calltipsStyle = Preferences.getEditor("CallTipsStyle")
 if calltipsStyle == QsciScintilla.CallTipsNoContext:
 self.setCallTipsStyle(QsciScintilla.CallTipsNoContext)
-elif calltipsStyle == \
+elif (
-QsciScintilla.CallTipsNoAutoCompletionContext:
+calltipsStyle ==
+QsciScintilla.CallTipsNoAutoCompletionContext
+):
 self.setCallTipsStyle(
 QsciScintilla.CallTipsNoAutoCompletionContext)
 else:
 self.setCallTipsStyle(QsciScintilla.CallTipsContext)
 else:
 self.__bindLexer(self.clientType)
 self.__setTextDisplay()
 self.__setMargin0()
 self.__setAutoCompletion(self.clientType)
 self.__setCallTips(self.clientType)
-self.racEnabled = \
+self.racEnabled = (
-Preferences.getShell("AutoCompletionEnabled") and \
+Preferences.getShell("AutoCompletionEnabled") and
 (cap & HasCompleter) > 0
+)
 if self.clientType not in self.__historyLists:
 # load history list
 self.loadHistory(self.clientType)
 self.__history = self.__historyLists[self.clientType]
 @param index index value to be set
 @type int or None
 """
 if index is None:
 # determine based on history style
-if self.clientType and \
+if (
-self.__historyStyle == ShellHistoryStyle.WindowsStyle:
+self.clientType and
+self.__historyStyle == ShellHistoryStyle.WindowsStyle
+):
 idx = int(Preferences.Prefs.settings.value(
 "Shell/HistoryIndexes/" + self.clientType, -1))
 if idx >= len(self.__history):
 idx = -1
 self.__histidx = idx
 self.__histidx = -1
 else:
 self.__histidx = index
 if self.__histidx >= len(self.__history):
 self.__histidx = -1
-if self.clientType and \
+if (
-self.__historyStyle == ShellHistoryStyle.WindowsStyle:
+self.clientType and
+self.__historyStyle == ShellHistoryStyle.WindowsStyle
+):
 Preferences.Prefs.settings.setValue(
 "Shell/HistoryIndexes/" + self.clientType, self.__histidx)
 def __isHistoryIndexValid(self):
 """
 @param exceptionMessage message given by the exception (string)
 @param stackTrace list of stack entries (list of string)
 """
 self .__clientError()
-if not self.__windowed and \
+if (
-Preferences.getDebugger("ShowExceptionInShell"):
+not self.__windowed and
+Preferences.getDebugger("ShowExceptionInShell")
+):
 if exceptionType:
 if stackTrace:
 self.__write(
 self.tr('Exception "{0}"\n{1}\nFile: {2}, Line: {3}\n')
 .format(
 @param characterNo character number of the syntax error position
 (integer)
 """
 self .__clientError()
-if not self.__windowed and \
+if (
-Preferences.getDebugger("ShowExceptionInShell"):
+not self.__windowed and
+Preferences.getDebugger("ShowExceptionInShell")
+):
 if message is None:
 self.__write(self.tr("Unspecified syntax error.\n"))
 else:
 self.__write(
 self.tr('Syntax error "{1}" in file {0} at line {2},'
 Protected method to handle wheel events.
 @param evt reference to the wheel event (QWheelEvent)
 """
 if evt.modifiers() & Qt.ControlModifier:
-if qVersionTuple() >= (5, 0, 0):
+delta = evt.angleDelta().y()
-delta = evt.angleDelta().y()
-else:
-delta = evt.delta()
 if delta < 0:
 self.zoomOut()
 elif delta > 0:
 self.zoomIn()
 evt.accept()
 self.prline, self.prcol = self.getCursorPosition()
 if self.echoInput:
 ac = self.isListActive()
 super(Shell, self).keyPressEvent(ev)
 self.incrementalSearchActive = True
-if ac and \
+if ac and self.racEnabled:
-self.racEnabled:
 self.dbs.remoteCompletion(self.completionText + txt)
 else:
 self.__insertTextNoEcho(txt)
 else:
 ev.ignore()
 if buf.startswith(sys.ps1):
 buf = buf.replace(sys.ps1, "")
 if buf.startswith(sys.ps2):
 buf = buf.replace(sys.ps2, "")
 if buf and self.incrementalSearchActive:
-if self.incrementalSearchString and \
+if (
-buf.startswith(self.incrementalSearchString):
+self.incrementalSearchString and
+buf.startswith(self.incrementalSearchString)
+):
 idx, found = self.__rsearchHistory(
 self.incrementalSearchString, self.__histidx)
 if found and idx >= 0:
 self.__setHistoryIndex(index=idx)
 self.__useHistory()
 if buf.startswith(sys.ps1):
 buf = buf.replace(sys.ps1, "")
 if buf.startswith(sys.ps2):
 buf = buf.replace(sys.ps2, "")
 if buf and self.incrementalSearchActive:
-if self.incrementalSearchString and \
+if (
-buf.startswith(self.incrementalSearchString):
+self.incrementalSearchString and
+buf.startswith(self.incrementalSearchString)
+):
 idx, found = self.__searchHistory(
 self.incrementalSearchString, self.__histidx)
 if found and idx >= 0:
 self.__setHistoryIndex(index=idx)
 self.__useHistory()
 self.__history.append(cmd)
 if self.__historyStyle == ShellHistoryStyle.LinuxStyle:
 self.__setHistoryIndex(index=-1)
 elif self.__historyStyle == ShellHistoryStyle.WindowsStyle:
 if historyIndex is None:
-if self.__histidx - 1 > 0 and \
+if (
-cmd != self.__history[self.__histidx - 1]:
+self.__histidx - 1 > 0 and
+cmd != self.__history[self.__histidx - 1]
+):
 self.__setHistoryIndex(index=-1)
 else:
 self.__setHistoryIndex(historyIndex)
 if cmd == 'start' or cmd.startswith('start '):
 if venvName == self.tr("Project"):
 if self.__project.isOpen():
 self.dbs.startClient(
 False, forProject=True,
 workingDir=self.__project.getProjectPath())
-self.__currentWorkingDirectory = \
+self.__currentWorkingDirectory = (
 self.__project.getProjectPath()
+)
 else:
 self.dbs.startClient(
 False, venvName=self.__currentVenv,
 workingDir=self.__currentWorkingDirectory)
 # same as reset
 if self.passive:
 return
 else:
 cmd = ''
 elif cmd in ['envs', 'environments']:
-venvs = e5App().getObject("VirtualEnvManager")\
+venvs = (
+e5App().getObject("VirtualEnvManager")
 .getVirtualenvNames()
+)
 s = self.tr('Available Virtual Environments:\n{0}\n').format(
 '\n'.join("- {0}".format(venv) for venv in sorted(venvs))
 )
 self.__write(s)
 self.__clientStatement(False)
 s = self.tr("Current Virtual Environment: '{0}'\n").format(
 self.__currentVenv)
 self.__write(s)
 self.__clientStatement(False)
 return
-elif cmd in ["quit", "quit()", "exit", "exit()"] and \
+elif (
-self.__windowed:
+cmd in ["quit", "quit()", "exit", "exit()"] and
+self.__windowed
+):
 # call main window quit()
 self.vm.quit()
 return
 self.dbs.remoteStatement(cmd)
 """
 if startIdx == -1:
 idx = 0
 else:
 idx = startIdx + 1
-while idx < len(self.__history) and \
+while (
-not self.__history[idx].startswith(txt):
+idx < len(self.__history) and
+not self.__history[idx].startswith(txt)
+):
 idx += 1
 found = (idx < len(self.__history) and
 self.__history[idx].startswith(txt))
 return idx, found
 """
 if startIdx == -1:
 idx = len(self.__history) - 1
 else:
 idx = startIdx - 1
-while idx >= 0 and \
+while (
-not self.__history[idx].startswith(txt):
+idx >= 0 and
+not self.__history[idx].startswith(txt)
+):
 idx -= 1
 found = idx >= 0 and self.__history[idx].startswith(txt)
 return idx, found
 def focusNextPrevChild(self, nextChild):
 @param action context menu action that was triggered (QAction)
 """
 venvName = action.text()
 if venvName == self.tr("Project"):
 if self.__project.isOpen():
-self.__currentWorkingDirectory = \
+self.__currentWorkingDirectory = (
 self.__project.getProjectPath()
+)
 self.dbs.startClient(False, forProject=True,
 workingDir=self.__currentWorkingDirectory)
 else:
 self.dbs.startClient(False, venvName=venvName)
 self.__getBanner()
 self.__setCallTips()
 # do the history related stuff
 self.__maxHistoryEntries = Preferences.getShell("MaxHistoryEntries")
 for key in list(self.__historyLists.keys()):
-self.__historyLists[key] = \
+self.__historyLists[key] = (
 self.__historyLists[key][-self.__maxHistoryEntries:]
+)
 self.__historyStyle = Preferences.getShell("HistoryStyle")
 self.__historyWrap = Preferences.getShell("HistoryWrap")
 self.__setHistoryIndex()
 if not self.__windowed:
 self.hmenu.menuAction().setEnabled(self.isHistoryEnabled())
-self.__historyNavigateByCursor = \
+self.__historyNavigateByCursor = Preferences.getShell(
-Preferences.getShell("HistoryNavigateByCursor")
+"HistoryNavigateByCursor")
 self.historyStyleChanged.emit(self.__historyStyle)
 # do stdout /stderr stuff
 showStdOutErr = Preferences.getShell("ShowStdOutErr")
 if self.__showStdOutErr != showStdOutErr:
 """
 Protected method to handle the drag enter event.
 @param event the drag enter event (QDragEnterEvent)
 """
-self.inDragDrop = event.mimeData().hasUrls() or \
+self.inDragDrop = (
+event.mimeData().hasUrls() or
 event.mimeData().hasText()
+)
 if self.inDragDrop:
 event.acceptProposedAction()
 else:
 super(Shell, self).dragEnterEvent(event)

Mercurial Repositories > eric / file comparison

comparison: eric6/QScintilla/Shell.py

eric6/QScintilla/Shell.py