beremiz

Conform to pep8 and pylint :

2019-04-07, Edouard Tisserant
8fb5c6eddc72
Conform to pep8 and pylint :

pep8 version: 2.3.1
./ConfigTreeNode.py:130:49: E231 missing whitespace after ','
./editors/Viewer.py:643:24: E128 continuation line under-indented for visual indent
./editors/Viewer.py:670:12: E221 multiple spaces before operator
./editors/Viewer.py:671:13: E221 multiple spaces before operator
./editors/Viewer.py:2138:52: E203 whitespace before ':'
./editors/Viewer.py:2139:66: W291 trailing whitespace
./controls/VariablePanel.py:154:25: E231 missing whitespace after ','
./controls/LocationCellEditor.py:88:1: W293 blank line contains whitespace
./controls/LocationCellEditor.py:191:25: E221 multiple spaces before operator
./controls/LocationCellEditor.py:200:17: E128 continuation line under-indented for visual indent

pylint 1.8.3,
************* Module controls.LocationCellEditor
controls/LocationCellEditor.py:200: [C0330(bad-continuation), ] Wrong continued indentation (add 9 spaces).
_("Selected location is identical to previous one"))
^ |
************* Module controls.VariablePanel
controls/VariablePanel.py:154: [E1601(print-statement), VariableTable.SetValue] print statement used
************* Module editors.Viewer
editors/Viewer.py:643: [C0330(bad-continuation), ] Wrong continued indentation (add 1 space).
self.GetAddMenuCallBack(self.AddNewComment))
^|
editors/Viewer.py:598: [W0612(unused-variable), Viewer.AddDivergenceMenuItems] Unused variable 'add_branch'
editors/Viewer.py:1655: [E0602(undefined-variable), Viewer.PopupConnectionMenu] Undefined variable 'variable_type'
editors/Viewer.py:1649: [W0612(unused-variable), Viewer.PopupConnectionMenu] Unused variable 'connection_type'
************* Module connectors.PYRO.PSK_Adapter
#!/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.
# Package initialisation
"""
Beremiz Targets
- Target are python packages, containing at least one "XSD" file
- Target class may inherit from a toolchain_(toolchainname)
- The target folder's name must match to name define in the XSD for TargetType
"""
from __future__ import absolute_import
from os import listdir, path
import util.paths as paths
_base_path = paths.AbsDir(__file__)
def _GetLocalTargetClassFactory(name):
return lambda: getattr(__import__(name, globals(), locals()), name+"_target")
targets = dict([(name, {"xsd": path.join(_base_path, name, "XSD"),
"class": _GetLocalTargetClassFactory(name),
"code": {fname: path.join(_base_path, name, fname)
for fname in listdir(path.join(_base_path, name))
if (fname.startswith("plc_%s_main" % name) and
fname.endswith(".c"))}})
for name in listdir(_base_path)
if (path.isdir(path.join(_base_path, name)) and
not name.startswith("__"))])
toolchains = {"gcc": path.join(_base_path, "XSD_toolchain_gcc"),
"makefile": path.join(_base_path, "XSD_toolchain_makefile")}
def GetBuilder(targetname):
return targets[targetname]["class"]()
def GetTargetChoices():
DictXSD_toolchain = {}
targetchoices = ""
# Get all xsd toolchains
for toolchainname, xsdfilename in toolchains.iteritems():
if path.isfile(xsdfilename):
DictXSD_toolchain["toolchain_"+toolchainname] = open(xsdfilename).read()
# Get all xsd targets
for target_name, nfo in targets.iteritems():
xsd_string = open(nfo["xsd"]).read()
targetchoices += xsd_string % dict(DictXSD_toolchain,
target_name=target_name)
return targetchoices
def GetTargetCode(targetname):
codedesc = targets[targetname]["code"]
code = "\n".join([open(fpath).read() for _fname, fpath in sorted(codedesc.items())])
return code
def GetHeader():
filename = paths.AbsNeighbourFile(__file__, "beremiz.h")
return open(filename).read()
def GetCode(name):
filename = paths.AbsNeighbourFile(__file__, name)
return open(filename).read()