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
# Copyright (C) 2017: Andrey Skvortsov
#
# 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.
from __future__ import absolute_import
from os.path import join
import util.paths as paths
from util.TranslationCatalogs import NoTranslate
sd = paths.AbsDir(__file__)
# Override gettext _ in this module
# since we just want string to be added to dictionnary
# but translation should happen here
_ = NoTranslate
LANGUAGES = ["IL", "ST", "FBD", "LD", "SFC"]
LOCATIONDATATYPES = {"X": ["BOOL"],
"B": ["SINT", "USINT", "BYTE", "STRING"],
"W": ["INT", "UINT", "WORD", "WSTRING"],
"D": ["DINT", "UDINT", "REAL", "DWORD"],
"L": ["LINT", "ULINT", "LREAL", "LWORD"]}
# -------------------------------------------------------------------------------
# Function Block Types definitions
# -------------------------------------------------------------------------------
StdTC6Libs = [(_("Standard function blocks"), join(sd, "Standard_Function_Blocks.xml")),
(_("Additional function blocks"), join(sd, "Additional_Function_Blocks.xml"))]
StdFuncsCSV = join(sd, "iec_std.csv")
def GetBlockInfos(pou):
infos = pou.getblockInfos()
infos["inputs"] = [
(var_name, var_type, "rising")
if var_name in ["CU", "CD"]
else (var_name, var_type, var_modifier)
for var_name, var_type, var_modifier in infos["inputs"]]
return infos
# -------------------------------------------------------------------------------
# Data Types definitions
# -------------------------------------------------------------------------------
#: Ordored list of common data types defined in the IEC 61131-3
#: Each type is associated to his direct parent type. It defines then a hierarchy
#: between type that permits to make a comparison of two types
TypeHierarchy_list = [
("ANY", None),
("ANY_DERIVED", "ANY"),
("ANY_ELEMENTARY", "ANY"),
("ANY_MAGNITUDE", "ANY_ELEMENTARY"),
("ANY_BIT", "ANY_ELEMENTARY"),
("ANY_NBIT", "ANY_BIT"),
("ANY_STRING", "ANY_ELEMENTARY"),
("ANY_DATE", "ANY_ELEMENTARY"),
("ANY_NUM", "ANY_MAGNITUDE"),
("ANY_REAL", "ANY_NUM"),
("ANY_INT", "ANY_NUM"),
("ANY_SINT", "ANY_INT"),
("ANY_UINT", "ANY_INT"),
("BOOL", "ANY_BIT"),
("SINT", "ANY_SINT"),
("INT", "ANY_SINT"),
("DINT", "ANY_SINT"),
("LINT", "ANY_SINT"),
("USINT", "ANY_UINT"),
("UINT", "ANY_UINT"),
("UDINT", "ANY_UINT"),
("ULINT", "ANY_UINT"),
("REAL", "ANY_REAL"),
("LREAL", "ANY_REAL"),
("TIME", "ANY_MAGNITUDE"),
("DATE", "ANY_DATE"),
("TOD", "ANY_DATE"),
("DT", "ANY_DATE"),
("STRING", "ANY_STRING"),
("BYTE", "ANY_NBIT"),
("WORD", "ANY_NBIT"),
("DWORD", "ANY_NBIT"),
("LWORD", "ANY_NBIT")
# ("WSTRING", "ANY_STRING") # TODO
]
DefaultType = "DINT"
DataTypeRange_list = [
("SINT", (-2**7, 2**7 - 1)),
("INT", (-2**15, 2**15 - 1)),
("DINT", (-2**31, 2**31 - 1)),
("LINT", (-2**63, 2**63 - 1)),
("USINT", (0, 2**8 - 1)),
("UINT", (0, 2**16 - 1)),
("UDINT", (0, 2**32 - 1)),
("ULINT", (0, 2**64 - 1))
]
ANY_TO_ANY_FILTERS = {
"ANY_TO_ANY": [
# simple type conv are let as C cast
(("ANY_INT", "ANY_BIT"), ("ANY_NUM", "ANY_BIT")),
(("ANY_REAL",), ("ANY_REAL",)),
# REAL_TO_INT
(("ANY_REAL",), ("ANY_SINT",)),
(("ANY_REAL",), ("ANY_UINT",)),
(("ANY_REAL",), ("ANY_BIT",)),
# TO_TIME
(("ANY_INT", "ANY_BIT"), ("ANY_DATE", "TIME")),
(("ANY_REAL",), ("ANY_DATE", "TIME")),
(("ANY_STRING",), ("ANY_DATE", "TIME")),
# FROM_TIME
(("ANY_DATE", "TIME"), ("ANY_REAL",)),
(("ANY_DATE", "TIME"), ("ANY_INT", "ANY_NBIT")),
(("TIME",), ("ANY_STRING",)),
(("DATE",), ("ANY_STRING",)),
(("TOD",), ("ANY_STRING",)),
(("DT",), ("ANY_STRING",)),
# TO_STRING
(("BOOL",), ("ANY_STRING",)),
(("ANY_BIT",), ("ANY_STRING",)),
(("ANY_REAL",), ("ANY_STRING",)),
(("ANY_SINT",), ("ANY_STRING",)),
(("ANY_UINT",), ("ANY_STRING",)),
# FROM_STRING
(("ANY_STRING",), ("BOOL",)),
(("ANY_STRING",), ("ANY_BIT",)),
(("ANY_STRING",), ("ANY_SINT",)),
(("ANY_STRING",), ("ANY_UINT",)),
(("ANY_STRING",), ("ANY_REAL",))
],
"BCD_TO_ANY": [
(("BYTE",), ("USINT",)),
(("WORD",), ("UINT",)),
(("DWORD",), ("UDINT",)),
(("LWORD",), ("ULINT",))
],
"ANY_TO_BCD": [
(("USINT",), ("BYTE",)),
(("UINT",), ("WORD",)),
(("UDINT",), ("DWORD",)),
(("ULINT",), ("LWORD",))
]
}
# remove gettext override
del _