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 wx

from plcopen.structures import TestIdentifier, IEC_KEYWORDS

from util.TranslationCatalogs import NoTranslate

def GetActionLanguages():

_ = NoTranslate

return [_("IL"), _("ST"), _("LD"), _("FBD")]

class PouActionDialog(wx.Dialog):

def __init__(self, parent):

wx.Dialog.__init__(self, parent, title=_('Create a new action'))

self.ACTION_LANGUAGES_DICT = dict([(_(language), language)

for language in GetActionLanguages()])

main_sizer = wx.FlexGridSizer(cols=1, hgap=0, rows=2, vgap=10)

main_sizer.AddGrowableCol(0)

main_sizer.AddGrowableRow(0)

infos_sizer = wx.FlexGridSizer(cols=2, hgap=5, rows=3, vgap=15)

infos_sizer.AddGrowableCol(1)

main_sizer.AddSizer(infos_sizer, border=20,

flag=wx.GROW | wx.TOP | wx.LEFT | wx.RIGHT)

actionname_label = wx.StaticText(self, label=_('Action Name:'))

infos_sizer.AddWindow(actionname_label, border=4,

flag=wx.ALIGN_CENTER_VERTICAL | wx.TOP)

self.ActionName = wx.TextCtrl(self, size=wx.Size(180, -1))

infos_sizer.AddWindow(self.ActionName, flag=wx.GROW)

language_label = wx.StaticText(self, label=_('Language:'))

infos_sizer.AddWindow(language_label, border=4,

flag=wx.ALIGN_CENTER_VERTICAL | wx.TOP)

self.Language = wx.ComboBox(self, style=wx.CB_READONLY)

infos_sizer.AddWindow(self.Language, flag=wx.GROW)

button_sizer = self.CreateButtonSizer(wx.OK | wx.CANCEL | wx.CENTRE)

self.Bind(wx.EVT_BUTTON, self.OnOK,

button_sizer.GetAffirmativeButton())

main_sizer.AddSizer(button_sizer, border=20,

flag=wx.ALIGN_RIGHT | wx.BOTTOM | wx.LEFT | wx.RIGHT)

self.SetSizer(main_sizer)

for option in GetActionLanguages():

self.Language.Append(_(option))

self.Fit()

self.PouNames = []

self.PouElementNames = []

def OnOK(self, event):

error = []

action_name = self.ActionName.GetValue()

if action_name == "":

error.append(_("Action Name"))

if self.Language.GetSelection() == -1:

error.append(_("Language"))

message = None

if len(error) > 0:

text = ""

for i, item in enumerate(error):

if i == 0:

text += item

elif i == len(error) - 1:

text += _(" and %s") % item

else:

text += _(", %s") % item

message = _("Form isn't complete. %s must be filled!") % text

elif not TestIdentifier(action_name):

message = _("\"%s\" is not a valid identifier!") % action_name

elif action_name.upper() in IEC_KEYWORDS:

message = _("\"%s\" is a keyword. It can't be used!") % action_name

elif action_name.upper() in self.PouNames:

message = _("A POU named \"%s\" already exists!") % action_name

elif action_name.upper() in self.PouElementNames:

message = _("\"%s\" element for this pou already exists!") % action_name

if message is not None:

dialog = wx.MessageDialog(self, message, _("Error"), wx.OK | wx.ICON_ERROR)

dialog.ShowModal()

dialog.Destroy()

else:

self.EndModal(wx.ID_OK)

def SetPouNames(self, pou_names):

self.PouNames = [pou_name.upper() for pou_name in pou_names]

def SetPouElementNames(self, element_names):

self.PouElementNames = [element_name.upper() for element_name in element_names]

def SetValues(self, values):

for item, value in values.items():

if item == "actionName":

self.ActionName.SetValue(value)

elif item == "language":

self.Language.SetStringSelection(_(value))

def GetValues(self):

values = {}

values["actionName"] = self.ActionName.GetValue()

values["language"] = self.ACTION_LANGUAGES_DICT[self.Language.GetStringSelection()]

return values