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) 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 __future__ import print_function
import os
import sys
import unittest
import time
import six
import pytest
import wx
import ddt
import conftest
import Beremiz
import PLCOpenEditor
class UserApplicationTest(unittest.TestCase):
def InstallExceptionHandler(self):
def handle_exception(e_type, e_value, e_traceback, exit=False):
# traceback.print_exception(e_type, e_value, e_traceback)
self.exc_info = [e_type, e_value, e_traceback]
self.exc_info = None
self.old_excepthook = sys.excepthook
sys.excepthook = handle_exception
def StartApp(self):
self.app = None
def FinishApp(self):
wx.CallAfter(self.app.frame.Close)
self.app.MainLoop()
self.app = None
def setUp(self):
self.app = None
def tearDown(self):
if self.app is not None and self.app.frame is not None:
self.FinishApp()
def RunUIActions(self, actions):
for act in actions:
wx.CallAfter(*act)
self.ProcessEvents()
def CheckForErrors(self):
if self.exc_info is not None:
# reraise catched previously exception
exc_type = self.exc_info[0]
exc_value = self.exc_info[1]
exc_traceback = self.exc_info[2]
six.reraise(exc_type, exc_value, exc_traceback)
def ProcessEvents(self):
for dummy in range(0, 30):
self.CheckForErrors()
wx.Yield()
time.sleep(0.01)
@ddt.ddt
class BeremizApplicationTest(UserApplicationTest):
"""Test Beremiz as whole application"""
def StartApp(self):
self.app = Beremiz.BeremizIDELauncher()
# disable default exception handler in Beremiz
self.app.InstallExceptionHandler = lambda: None
self.InstallExceptionHandler()
self.app.handle_exception = sys.excepthook
self.app.PreStart()
self.ProcessEvents()
self.app.frame.Show()
self.ProcessEvents()
self.app.frame.ShowFullScreen(True)
self.ProcessEvents()
def FinishApp(self):
wx.CallAfter(self.app.frame.Close)
self.app.MainLoop()
time.sleep(1)
self.app = None
def GetSkippedProjectTreeItems(self):
"""
Returns the list of skipped items in the project tree.
Beremiz test don't need to skip any elemnts in the project tree.
"""
return []
def OpenAllProjectElements(self):
"""Open editor for every object in the project tree"""
self.app.frame.ProjectTree.ExpandAll()
self.ProcessEvents()
item = self.app.frame.ProjectTree.GetRootItem()
skip = self.GetSkippedProjectTreeItems()
tree_id = self.app.frame.ProjectTree.GetId()
while item is not None:
self.app.frame.ProjectTree.SelectItem(item, True)
self.ProcessEvents()
if item not in skip:
event = wx.lib.agw.customtreectrl.TreeEvent(
wx.lib.agw.customtreectrl.wxEVT_TREE_ITEM_ACTIVATED,
tree_id, item)
self.app.frame.OnProjectTreeItemActivated(event)
self.ProcessEvents()
item = self.app.frame.ProjectTree.GetNextVisible(item)
def CheckTestProject(self, project):
sys.argv = ["", project]
self.StartApp()
self.OpenAllProjectElements()
user_actions = self.GetUserActions()
self.RunUIActions(user_actions)
self.FinishApp()
def GetProjectPath(self, project):
return os.path.abspath(os.path.join(os.path.dirname(__file__), "..", project))
def GetUserActions(self):
"""
Returns list of user actions that will be executed
on every test project by testCheckProject test.
"""
user_actions = [
[self.app.frame.SwitchFullScrMode, None],
[self.app.frame.SwitchFullScrMode, None],
[self.app.frame.CTR._Clean],
[self.app.frame.CTR._Build],
[self.app.frame.CTR._Connect],
[self.app.frame.CTR._Transfer],
[self.app.frame.CTR._Run],
[self.app.frame.CTR._Stop],
[self.app.frame.CTR._Disconnect],
[self.app.frame.CTR._Clean],
]
return user_actions
def testStartUp(self):
"""Checks whether the app starts and finishes correctly"""
sys.argv = [""]
self.StartApp()
self.FinishApp()
@ddt.data(
"first_steps",
"logging",
"svgui",
"traffic_lights",
"wxGlade",
"python",
"wiimote",
"wxHMI",
)
@pytest.mark.timeout(30)
def testCheckProject(self, name):
"""
Checks that test PLC project can be open,
compiled and run on SoftPLC.
"""
project = self.GetProjectPath(name)
print("Testing example " + name)
self.CheckTestProject(project)
class PLCOpenEditorApplicationTest(BeremizApplicationTest):
"""Test PLCOpenEditor as whole application"""
def StartApp(self):
self.app = PLCOpenEditor.PLCOpenEditorApp()
# disable default exception handler in application
self.app.InstallExceptionHandler = lambda: None
self.InstallExceptionHandler()
self.app.Show()
self.ProcessEvents()
self.app.frame.ShowFullScreen(True)
self.ProcessEvents()
def FinishApp(self):
wx.CallAfter(self.app.frame.Close)
self.app.MainLoop()
time.sleep(1)
self.app = None
def GetSkippedProjectTreeItems(self):
"""
Returns the list of skipped items in the project tree.
Root item opens dialog window for project settings.
To avoid code that handles closing dialog windows just skip this item.
"""
return [self.app.frame.ProjectTree.GetRootItem()]
def GetUserActions(self):
return []
def GetProjectPath(self, project):
"""Open PLC program in every Beremiz test project"""
project_dir = BeremizApplicationTest.GetProjectPath(self, project)
return os.path.join(project_dir, "plc.xml")
if __name__ == '__main__':
conftest.init_environment()
unittest.main()