HGKeeper

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.

# 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

import os

from c_ext.CFileEditor import CFileEditor

from CodeFileTreeNode import CodeFile

class CFile(CodeFile):

XSD = """<?xml version="1.0" encoding="ISO-8859-1" ?>

<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">

<xsd:element name="CExtension">

<xsd:complexType>

<xsd:attribute name="CFLAGS" type="xsd:string" use="required"/>

<xsd:attribute name="LDFLAGS" type="xsd:string" use="required"/>

</xsd:complexType>

</xsd:element>

</xsd:schema>

"""

CODEFILE_NAME = "CFile"

SECTIONS_NAMES = [

"includes",

"globals",

"initFunction",

"cleanUpFunction",

"retrieveFunction",

"publishFunction"]

EditorType = CFileEditor

def GetIconName(self):

return "Cfile"

def CodeFileName(self):

return os.path.join(self.CTNPath(), "cfile.xml")

def CTNGenerate_C(self, buildpath, locations):

"""

Generate C code

@param current_location: Tupple containing confnode IEC location : %I0.0.4.5 => (0,0,4,5)

@param locations: List of complete variables locations \

[{"IEC_TYPE" : the IEC type (i.e. "INT", "STRING", ...)

"NAME" : name of the variable (generally "__IW0_1_2" style)

"DIR" : direction "Q","I" or "M"

"SIZE" : size "X", "B", "W", "D", "L"

"LOC" : tuple of interger for IEC location (0,1,2,...)

}, ...]

@return: [(C_file_name, CFLAGS),...] , LDFLAGS_TO_APPEND

"""

current_location = self.GetCurrentLocation()

# define a unique name for the generated C file

location_str = "_".join(map(str, current_location))

text = "/* Code generated by Beremiz c_ext confnode */\n\n"

text += "#include <stdio.h>\n\n"

# Adding includes

text += "/* User includes */\n"

text += self.CodeFile.includes.getanyText().strip()

text += "\n"

text += '#include "iec_types_all.h"\n\n'

# Adding variables

config = self.GetCTRoot().GetProjectConfigNames()[0]

text += "/* User variables reference */\n"

for variable in self.CodeFile.variables.variable:

var_infos = {

"name": variable.getname(),

"global": "%s__%s" % (config.upper(),

variable.getname().upper()),

"type": "__IEC_%s_t" % variable.gettype()}

text += "extern %(type)s %(global)s;\n" % var_infos

text += "#define %(name)s %(global)s.value\n" % var_infos

text += "\n"

# Adding user global variables and routines

text += "/* User internal user variables and routines */\n"

text += self.CodeFile.globals.getanyText().strip()

text += "\n"

# Adding Beremiz confnode functions

text += "/* Beremiz confnode functions */\n"

text += "int __init_%s(int argc,char **argv)\n{\n" % location_str

text += self.CodeFile.initFunction.getanyText().strip()

text += " return 0;\n}\n\n"

text += "void __cleanup_%s(void)\n{\n" % location_str

text += self.CodeFile.cleanUpFunction.getanyText().strip()

text += "\n}\n\n"

text += "void __retrieve_%s(void)\n{\n" % location_str

text += self.CodeFile.retrieveFunction.getanyText().strip()

text += "\n}\n\n"

text += "void __publish_%s(void)\n{\n" % location_str

text += self.CodeFile.publishFunction.getanyText().strip()

text += "\n}\n\n"

Gen_Cfile_path = os.path.join(buildpath, "CFile_%s.c" % location_str)

cfile = open(Gen_Cfile_path, 'w')

cfile.write(text)

cfile.close()

matiec_CFLAGS = '"-I%s"' % os.path.abspath(self.GetCTRoot().GetIECLibPath())

return [(Gen_Cfile_path, str(self.CExtension.getCFLAGS() + matiec_CFLAGS))], str(self.CExtension.getLDFLAGS()), True