beremiz

Fix various pylint and pep8 errors

2019-03-13, Andrey Skvortsov
eb4a4cc41914
Fix various pylint and pep8 errors

Check basic code-style problems for PEP-8
pep8 version: 2.4.0
./connectors/PYRO/__init__.py:57:43: E261 at least two spaces before inline comment
./connectors/SchemeEditor.py:29:21: E128 continuation line under-indented for visual indent
./controls/IDBrowser.py:101:23: E127 continuation line over-indented for visual indent
./controls/IDBrowser.py:102:23: E127 continuation line over-indented for visual indent

Check for problems using pylint ...
No config file found, using default configuration
pylint 1.9.4,
astroid 1.6.5
Python 2.7.16rc1 (default, Feb 18 2019, 11:05:09)
[GCC 8.2.0]
Use multiple threads for pylint
Using config file /home/developer/WorkData/PLC/beremiz/beremiz/.pylint
************* Module connectors.PYRO_dialog
connectors/PYRO_dialog.py:9: [W0611(unused-import), ] Unused import wx
************* Module connectors
connectors/__init__.py:32: [W1652(deprecated-types-field), ] Accessing a deprecated fields on the types module
connectors/__init__.py:32: [C0411(wrong-import-order), ] standard import "from types import ClassType" should be placed before "from connectors.ConnectorBase import ConnectorBase"
************* Module connectors.PYRO.PSK_Adapter
connectors/PYRO/PSK_Adapter.py:7: [C0411(wrong-import-order), ] standard import "import ssl" should be placed before "import sslpsk"
************* Module connectors.SchemeEditor
connectors/SchemeEditor.py:29: [C0330(bad-continuation), ] Wrong continued indentation (add 1 space).
wx.ALIGN_CENTER_VERTICAL),
^|
connectors/SchemeEditor.py:42: [W0631(undefined-loop-variable), SchemeEditor.__init__] Using possibly undefined loop variable 'tag'
************* Module runtime.WampClient
runtime/WampClient.py:138: [W1612(unicode-builtin), WampSession.onJoin] unicode built-in referenced
runtime/WampClient.py:154: [W1612(unicode-builtin), WampSession.publishWithOwnID] unicode built-in referenced
runtime/WampClient.py:346: [W1612(unicode-builtin), PublishEvent] unicode built-in referenced
runtime/WampClient.py:351: [W1612(unicode-builtin), PublishEventWithOwnID] unicode built-in referenced
runtime/WampClient.py:31: [W0611(unused-import), ] Unused str imported from builtins as text
************* Module runtime.PLCObject
runtime/PLCObject.py:35: [W1648(bad-python3-import), ] Module moved in Python 3
runtime/PLCObject.py:35: [C0411(wrong-import-order), ] standard import "import md5" should be placed before "from six.moves import xrange"
runtime/PLCObject.py:36: [C0411(wrong-import-order), ] standard import "from tempfile import mkstemp" should be placed before "from six.moves import xrange"
runtime/PLCObject.py:37: [C0411(wrong-import-order), ] standard import "import shutil" should be placed before "from six.moves import xrange"
runtime/PLCObject.py:38: [C0411(wrong-import-order), ] standard import "from functools import wraps, partial" should be placed before "from six.moves import xrange"
************* Module runtime.Worker
runtime/Worker.py:12: [W1648(bad-python3-import), ] Module moved in Python 3
************* Module runtime.spawn_subprocess
runtime/spawn_subprocess.py:125: [C0325(superfluous-parens), ] Unnecessary parens after 'print' keyword
runtime/spawn_subprocess.py:130: [C0325(superfluous-parens), ] Unnecessary parens after 'print' keyword
runtime/spawn_subprocess.py:125: [E1601(print-statement), ] print statement used
runtime/spawn_subprocess.py:130: [E1601(print-statement), ] print statement used
************* Module controls.IDBrowser
controls/IDBrowser.py:101: [C0330(bad-continuation), ] Wrong continued indentation (remove 5 spaces).
if self.isManager
| ^
controls/IDBrowser.py:102: [C0330(bad-continuation), ] Wrong continued indentation (remove 5 spaces).
else dv.DATAVIEW_CELL_INERT),
| ^
************* Module Beremiz_service
Beremiz_service.py:34: [W0611(unused-import), ] Unused import __builtin__
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This file is part of Beremiz, a Integrated Development Environment for
# programming IEC 61131-3 automates supporting plcopen standard and CanFestival.
#
# Copyright (C) 2007: Edouard TISSERANT and Laurent BESSARD
#
# See COPYING file for copyrights details.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# pylint: disable=old-style-class,undefined-variable
class button:
def __init__(self, parent, id, args):
self.parent = parent
self.id = id
self.back_elt = getSVGElementById(args.back_id)
self.sele_elt = getSVGElementById(args.sele_id)
self.toggle = args.toggle
self.active = args.active
if args.state != undefined:
self.state = args.state
else:
self.state = False
self.dragging = False
if self.toggle:
self.up = not self.state
else:
self.up = True
# Add event on each element of the button
if self.active:
self.back_elt.addEventListener("mouseup", self, False)
self.back_elt.addEventListener("mousedown", self, False)
self.back_elt.addEventListener("mouseover", self, False)
self.back_elt.addEventListener("mouseout", self, False)
self.sele_elt.addEventListener("mouseup", self, False)
self.sele_elt.addEventListener("mousedown", self, False)
self.sele_elt.addEventListener("mouseover", self, False)
self.sele_elt.addEventListener("mouseout", self, False)
blockSVGElementDrag(self.back_elt)
blockSVGElementDrag(self.sele_elt)
self.updateElements()
# method to display the current state of interface
def updateElements(self):
if self.up:
self.sele_elt.setAttribute("display", "none")
self.back_elt.removeAttribute("display")
else:
self.sele_elt.removeAttribute("display")
self.back_elt.setAttribute("display", "none")
def updateValues(self, values):
if values.state != self.state:
self.state = values.state
self.up = not self.state
if self.toggle:
updateAttr(self.id, 'state', self.state)
self.updateElements()
def handleEvent(self, evt):
# Quand le bouton de la souris est presse
if evt.type == "mousedown":
evt.stopPropagation()
setCurrentObject(self)
self.dragging = True
if self.toggle:
self.up = self.state
else:
self.up = False
self.state = True
updateAttr(self.id, 'state', self.state)
self.updateElements()
if isCurrentObject(self) and self.dragging:
# Quand le bouton est survole
if evt.type == "mouseover" and self.toggle:
self.up = self.state
self.updateElements()
# Quand le curseur quitte la zone du bouton
elif evt.type == "mouseout" and self.toggle:
self.up = not self.state
self.updateElements()
# Quand le bouton de la souris est relache
elif evt.type == "mouseup":
evt.stopPropagation()
if self.toggle and self.up == self.state:
self.state = not self.state
updateAttr(self.id, 'state', self.state)
elif not self.toggle:
self.up = True
self.state = False
updateAttr(self.id, 'state', self.state)
self.updateElements()
self.dragging = False
class textControl:
def __init__(self, parent, id, args):
self.parent = parent
self.id = id
self.back_elt = getSVGElementById(args.back_id)
if args.text != undefined:
self.text = args.text
else:
self.text = ""
self.updateElements()
def updateValues(self, values):
if values.text != self.value:
self.text = values.text
updateAttr(self.id, 'text', self.text)
self.updateElements()
def updateElements(self):
self.back_elt.firstChild.firstChild.textContent = self.text
def handleEvent(self, evt):
pass