Merge pull request #3654 from janezd/pylint-owpythonscript

OWPythonScript: PyLint

Author: markotoplak

Orange/widgets/data/owpythonscript.py

@@ -20,7 +20,8 @@
 from Orange.canvas.gui.utils import OSX_NSURL_toLocalFile
 from Orange.data import Table
 from Orange.base import Learner, Model
-from Orange.widgets import widget, gui
+from Orange.util import interleave
+from Orange.widgets import gui
 from Orange.widgets.utils import itemmodels
 from Orange.widgets.settings import Setting
 from Orange.widgets.utils.widgetpreview import WidgetPreview
@@ -78,15 +79,15 @@ def __init__(self, parent=None):
         super().__init__(parent)
 
     def highlightBlock(self, text):
-        for pattern, format in self.rules:
+        for pattern, fmt in self.rules:
             exp = QRegExp(pattern)
             index = exp.indexIn(text)
             while index >= 0:
                 length = exp.matchedLength()
                 if exp.captureCount() > 0:
-                    self.setFormat(exp.pos(1), len(str(exp.cap(1))), format)
+                    self.setFormat(exp.pos(1), len(str(exp.cap(1))), fmt)
                 else:
-                    self.setFormat(exp.pos(0), len(str(exp.cap(0))), format)
+                    self.setFormat(exp.pos(0), len(str(exp.cap(0))), fmt)
                 index = exp.indexIn(text, index + length)
 
         # Multi line strings
@@ -172,9 +173,12 @@ def pasteFile(self, url):
 
 
 class PythonConsole(QPlainTextEdit, code.InteractiveConsole):
+    # `locals` is reasonably used as argument name
+    # pylint: disable=redefined-builtin
     def __init__(self, locals=None, parent=None):
         QPlainTextEdit.__init__(self, parent)
         code.InteractiveConsole.__init__(self, locals)
+        self.newPromptPos = 0
         self.history, self.historyInd = [""], 0
         self.loop = self.interact()
         next(self.loop)
@@ -185,7 +189,7 @@ def setLocals(self, locals):
     def updateLocals(self, locals):
         self.locals.update(locals)
 
-    def interact(self, banner=None):
+    def interact(self, banner=None, _=None):
         try:
             sys.ps1
         except AttributeError:
@@ -223,9 +227,9 @@ def interact(self, banner=None):
                 self.resetbuffer()
                 more = 0
 
-    def raw_input(self, prompt):
-        input = str(self.document().lastBlock().previous().text())
-        return input[len(prompt):]
+    def raw_input(self, prompt=""):
+        input_str = str(self.document().lastBlock().previous().text())
+        return input_str[len(prompt):]
 
     def new_prompt(self, prompt):
         self.write(prompt)
@@ -328,25 +332,7 @@ def insertFromMimeData(self, source):
             return
 
 
-def interleave(seq1, seq2):
-    """
-    Interleave elements of `seq2` between consecutive elements of `seq1`.
-
-        >>> list(interleave([1, 3, 5], [2, 4]))
-        [1, 2, 3, 4, 5]
-
-    """
-    iterator1, iterator2 = iter(seq1), iter(seq2)
-    leading = next(iterator1)
-    for element in iterator1:
-        yield leading
-        yield next(iterator2)
-        leading = element
-
-    yield leading
-
-
-class Script(object):
+class Script:
     Modified = 1
     MissingFromFilesystem = 2
 
@@ -358,10 +344,8 @@ def __init__(self, name, script, flags=0, filename=None):
 
 
 class ScriptItemDelegate(QStyledItemDelegate):
-    def __init__(self, parent):
-        super().__init__(parent)
-
-    def displayText(self, script, locale):
+    @staticmethod
+    def displayText(script, _locale):
         if script.flags & Script.Modified:
             return "*" + script.name
         else:
@@ -376,14 +360,17 @@ def paint(self, painter, option, index):
             option.palette.setColor(QPalette.Highlight, QColor(Qt.darkRed))
         super().paint(painter, option, index)
 
-    def createEditor(self, parent, option, index):
+    @staticmethod
+    def createEditor(parent, _option, _index):
         return QLineEdit(parent)
 
-    def setEditorData(self, editor, index):
+    @staticmethod
+    def setEditorData(editor, index):
         script = index.data(Qt.DisplayRole)
         editor.setText(script.name)
 
-    def setModelData(self, editor, model, index):
+    @staticmethod
+    def setModelData(editor, model, index):
         model[index.row()].name = str(editor.text())
 
 
@@ -396,7 +383,7 @@ def select_row(view, row):
                     QItemSelectionModel.ClearAndSelect)
 
 
-class OWPythonScript(widget.OWWidget):
+class OWPythonScript(OWWidget):
     name = "Python Script"
     description = "Write a Python script and run it on input data or models."
     icon = "icons/PythonScript.svg"
@@ -421,6 +408,8 @@ class Outputs:
 
     signal_names = ("data", "learner", "classifier", "object")
 
+    libraryListSource: list
+
     libraryListSource = \
         Setting([Script("Hello world", "print('Hello world')\n")])
     currentScriptIndex = Setting(0)
@@ -576,30 +565,30 @@ def restoreScriptText(self):
     def saveScriptText(self):
         self.scriptText = self.text.toPlainText()
 
-    def handle_input(self, obj, id, signal):
-        id = id[0]
+    def handle_input(self, obj, sig_id, signal):
+        sig_id = sig_id[0]
         dic = getattr(self, signal)
         if obj is None:
-            if id in dic.keys():
-                del dic[id]
+            if sig_id in dic.keys():
+                del dic[sig_id]
         else:
-            dic[id] = obj
+            dic[sig_id] = obj
 
     @Inputs.data
-    def set_data(self, data, id):
-        self.handle_input(data, id, "data")
+    def set_data(self, data, sig_id):
+        self.handle_input(data, sig_id, "data")
 
     @Inputs.learner
-    def set_learner(self, data, id):
-        self.handle_input(data, id, "learner")
+    def set_learner(self, data, sig_id):
+        self.handle_input(data, sig_id, "learner")
 
     @Inputs.classifier
-    def set_classifier(self, data, id):
-        self.handle_input(data, id, "classifier")
+    def set_classifier(self, data, sig_id):
+        self.handle_input(data, sig_id, "classifier")
 
     @Inputs.object
-    def set_object(self, data, id):
-        self.handle_input(data, id, "object")
+    def set_object(self, data, sig_id):
+        self.handle_input(data, sig_id, "object")
 
     def handleNewSignals(self):
         self.commit()
@@ -614,11 +603,11 @@ def selectedScriptIndex(self):
     def setSelectedScript(self, index):
         select_row(self.libraryView, index)
 
-    def onAddScript(self, *args):
+    def onAddScript(self, *_):
         self.libraryList.append(Script("New script", self.text.toPlainText(), 0))
         self.setSelectedScript(len(self.libraryList) - 1)
 
-    def onAddScriptFromFile(self, *args):
+    def onAddScriptFromFile(self, *_):
         filename, _ = QFileDialog.getOpenFileName(
             self, 'Open Python Script',
             os.path.expanduser("~/"),
@@ -632,18 +621,18 @@ def onAddScriptFromFile(self, *args):
             self.libraryList.append(Script(name, contents, 0, filename))
             self.setSelectedScript(len(self.libraryList) - 1)
 
-    def onRemoveScript(self, *args):
+    def onRemoveScript(self, *_):
         index = self.selectedScriptIndex()
         if index is not None:
             del self.libraryList[index]
             select_row(self.libraryView, max(index - 1, 0))
 
-    def onSaveScriptToFile(self, *args):
+    def onSaveScriptToFile(self, *_):
         index = self.selectedScriptIndex()
         if index is not None:
             self.saveScript()
 
-    def onSelectedScriptChanged(self, selected, deselected):
+    def onSelectedScriptChanged(self, selected, _deselected):
         index = [i.row() for i in selected.indexes()]
         if index:
             current = index[0]
@@ -655,7 +644,7 @@ def onSelectedScriptChanged(self, selected, deselected):
             self.currentScriptIndex = current
 
     def documentForScript(self, script=0):
-        if type(script) != Script:
+        if not isinstance(script, Script):
             script = self.libraryList[script]
         if script not in self._cachedDocuments:
             doc = QTextDocument(self)
@@ -668,7 +657,7 @@ def documentForScript(self, script=0):
             self._cachedDocuments[script] = doc
         return self._cachedDocuments[script]
 
-    def commitChangesToLibrary(self, *args):
+    def commitChangesToLibrary(self, *_):
         index = self.selectedScriptIndex()
         if index is not None:
             self.libraryList[index].script = self.text.toPlainText()
@@ -681,7 +670,7 @@ def onModificationChanged(self, modified):
             self.libraryList[index].flags = Script.Modified if modified else 0
             self.libraryList.emitDataChanged(index)
 
-    def onSpliterMoved(self, pos, ind):
+    def onSpliterMoved(self, _pos, _ind):
         self.splitterState = bytes(self.splitCanvas.saveState())
 
     def restoreSaved(self):
@@ -728,7 +717,6 @@ def initial_locals_state(self):
 
     def commit(self):
         self.Error.clear()
-        self._script = str(self.text.toPlainText())
         lcls = self.initial_locals_state()
         lcls["_script"] = str(self.text.toPlainText())
         self.console.updateLocals(lcls)
@@ -746,7 +734,8 @@ def commit(self):
                 out_var = None
             getattr(self.Outputs, signal).send(out_var)
 
-    def dragEnterEvent(self, event):
+    @staticmethod
+    def dragEnterEvent(event):
         urls = event.mimeData().urls()
         if urls:
             # try reading the file as text