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.

# Package initialisation

from __future__ import absolute_import

from os import listdir, path

from connectors.ConnectorBase import ConnectorBase

connectors_packages = ["PYRO", "WAMP"]

def _GetLocalConnectorClassFactory(name):

return lambda: getattr(__import__(name, globals(), locals()), name + "_connector_factory")

connectors = {name: _GetLocalConnectorClassFactory(name)

for name in connectors_packages}

_dialogs_imported = False

per_URI_connectors = None

schemes = None

# lazy import of connectors dialogs, only if used

def _Import_Dialogs():

global per_URI_connectors, schemes, _dialogs_imported

if not _dialogs_imported:

_dialogs_imported = True

per_URI_connectors = {}

schemes = []

for con_name in connectors_packages:

module = __import__(con_name + '_dialog', globals(), locals())

for scheme in module.Schemes:

per_URI_connectors[scheme] = getattr(module, con_name + '_dialog')

schemes += [scheme]

def ConnectorFactory(uri, confnodesroot):

"""

Return a connector corresponding to the URI

or None if cannot connect to URI

"""

_scheme = uri.split("://")[0].upper()

# commented code to enable for MDNS:// support

# _scheme, location = uri.split("://")

# _scheme = _scheme.upper()

if _scheme == "LOCAL":

# Local is special case

# pyro connection to local runtime

# started on demand, listening on random port

scheme = "PYRO"

runtime_port = confnodesroot.AppFrame.StartLocalRuntime(

taskbaricon=True)

uri = "PYROLOC://127.0.0.1:" + str(runtime_port)

# commented code to enable for MDNS:// support

# elif _scheme == "MDNS":

# try:

# from zeroconf import Zeroconf

# r = Zeroconf()

# i = r.get_service_info(zeroconf_service_type, location)

# if i is None:

# raise Exception("'%s' not found" % location)

# ip = str(socket.inet_ntoa(i.address))

# port = str(i.port)

# newlocation = ip + ':' + port

# confnodesroot.logger.write(_("'{a1}' is located at {a2}\n").format(a1=location, a2=newlocation))

# location = newlocation

# # not a bug, but a workaround against obvious downgrade attack

# scheme = "PYROS"

# r.close()

# except Exception:

# confnodesroot.logger.write_error(_("MDNS resolution failure for '%s'\n") % location)

# confnodesroot.logger.write_error(traceback.format_exc())

# return None

elif _scheme in connectors:

scheme = _scheme

elif _scheme[-1] == 'S' and _scheme[:-1] in connectors:

scheme = _scheme[:-1]

else:

return None

# import module according to uri type and get connector specific baseclass

# first call to import the module,

# then call with parameters to create the class

connector_specific_class = connectors[scheme]()(uri, confnodesroot)

if connector_specific_class is None:

return None

# new class inheriting from generic and specific connector base classes

return type(_scheme + "_connector",

(ConnectorBase, connector_specific_class), {})()

def EditorClassFromScheme(scheme):

_Import_Dialogs()

return per_URI_connectors.get(scheme, None)

def ConnectorSchemes():

_Import_Dialogs()

return schemes