# HG changeset patch # User Andrey Skvortsov # Date 1502743108 -10800 # Node ID d2e97973870077c447d528f0c3cf8946449f2283 # Parent a39c2918c0155a5619e0c1a3ebf155cfb0931ea5 clean-up: fix PEP8 E271 multiple spaces after keyword diff -r a39c2918c015 -r d2e979738700 Beremiz_service.py --- a/Beremiz_service.py Mon Aug 14 23:34:22 2017 +0300 +++ b/Beremiz_service.py Mon Aug 14 23:38:28 2017 +0300 @@ -296,7 +296,7 @@ def OnTaskBarStartPLC(self, evt): if self.pyroserver.plcobj is not None: plcstatus = self.pyroserver.plcobj.GetPLCstatus()[0] - if plcstatus is "Stopped": + if plcstatus is "Stopped": self.pyroserver.plcobj.StartPLC() else: print _("PLC is empty or already started.") diff -r a39c2918c015 -r d2e979738700 ConfigTreeNode.py --- a/ConfigTreeNode.py Mon Aug 14 23:34:22 2017 +0300 +++ b/ConfigTreeNode.py Mon Aug 14 23:38:28 2017 +0300 @@ -352,13 +352,13 @@ """ @return: String "ParentParentName.ParentName.Name" """ - return self.CTNParent._GetCurrentName() + self.BaseParams.getName() + return self.CTNParent._GetCurrentName() + self.BaseParams.getName() def _GetCurrentName(self): """ @return: String "ParentParentName.ParentName.Name." """ - return self.CTNParent._GetCurrentName() + self.BaseParams.getName() + "." + return self.CTNParent._GetCurrentName() + self.BaseParams.getName() + "." def GetCTRoot(self): return self.CTNParent.GetCTRoot() diff -r a39c2918c015 -r d2e979738700 canfestival/canfestival.py --- a/canfestival/canfestival.py Mon Aug 14 23:34:22 2017 +0300 +++ b/canfestival/canfestival.py Mon Aug 14 23:38:28 2017 +0300 @@ -77,10 +77,10 @@ (index, subindex)))), "description": "", "children": []}) - return {"name": name, - "type": LOCATION_CONFNODE, - "location": ".".join([str(i) for i in current_location]) + ".x", - "children": entries + return {"name": name, + "type": LOCATION_CONFNODE, + "location": ".".join([str(i) for i in current_location]) + ".x", + "children": entries } #-------------------------------------------------- diff -r a39c2918c015 -r d2e979738700 controls/VariablePanel.py --- a/controls/VariablePanel.py Mon Aug 14 23:34:22 2017 +0300 +++ b/controls/VariablePanel.py Mon Aug 14 23:38:28 2017 +0300 @@ -323,7 +323,7 @@ elif (element_type not in ["config", "resource", "function"] and values[1] == "Global" and self.ParentWindow.Filter in ["All", "Interface", "External"] or element_type != "function" and values[1] in ["location", "NamedConstant"]): - if values[1] in ["location","NamedConstant"]: + if values[1] in ["location","NamedConstant"]: var_name = values[3] else: var_name = values[0] diff -r a39c2918c015 -r d2e979738700 dialogs/DiscoveryDialog.py --- a/dialogs/DiscoveryDialog.py Mon Aug 14 23:34:22 2017 +0300 +++ b/dialogs/DiscoveryDialog.py Mon Aug 14 23:38:28 2017 +0300 @@ -25,7 +25,7 @@ import socket import wx -import wx.lib.mixins.listctrl as listmix +import wx.lib.mixins.listctrl as listmix from util.Zeroconf import * import connectors diff -r a39c2918c015 -r d2e979738700 i18n/mki18n.py --- a/i18n/mki18n.py Mon Aug 14 23:34:22 2017 +0300 +++ b/i18n/mki18n.py Mon Aug 14 23:38:28 2017 +0300 @@ -451,7 +451,7 @@ printUsage(e[0]) sys.exit(1) for (opt,val) in optionList: - if (opt == '-h'): + if (opt == '-h'): printUsage() sys.exit(0) elif (opt == '-e'): option['forceEnglish'] = 1 diff -r a39c2918c015 -r d2e979738700 svgui/pyjs/pyjs.py --- a/svgui/pyjs/pyjs.py Mon Aug 14 23:34:22 2017 +0300 +++ b/svgui/pyjs/pyjs.py Mon Aug 14 23:38:28 2017 +0300 @@ -1370,7 +1370,7 @@ v = node.value if isinstance(node.value, unicode): v = v.encode('utf-8') - return "String('%s')" % escapejs(v) + return "String('%s')" % escapejs(v) elif node.value is None: return "null" else: @@ -1471,7 +1471,7 @@ lower = self.expr(node.lower, current_klass) if node.upper != None: upper = self.expr(node.upper, current_klass) - return "pyjslib.slice(" + self.expr(node.expr, current_klass) + ", " + lower + ", " + upper + ")" + return "pyjslib.slice(" + self.expr(node.expr, current_klass) + ", " + lower + ", " + upper + ")" else: raise TranslationError("unsupported flag (in _slice)", node) diff -r a39c2918c015 -r d2e979738700 targets/typemapping.py --- a/targets/typemapping.py Mon Aug 14 23:34:22 2017 +0300 +++ b/targets/typemapping.py Mon Aug 14 23:38:28 2017 +0300 @@ -47,7 +47,7 @@ ("ns", c_long)] # tv_nsec -def _t(t, u=lambda x:x.value, p=lambda t,x:t(x)): return (t, u, p) +def _t(t, u=lambda x:x.value, p=lambda t,x:t(x)): return (t, u, p) def _ttime(): return (IEC_TIME, diff -r a39c2918c015 -r d2e979738700 version.py --- a/version.py Mon Aug 14 23:34:22 2017 +0300 +++ b/version.py Mon Aug 14 23:38:28 2017 +0300 @@ -30,7 +30,7 @@ def GetCommunityHelpMsg(): - return _("The best place to ask questions about Beremiz/PLCOpenEditor\n" + return _("The best place to ask questions about Beremiz/PLCOpenEditor\n" "is project's mailing list: beremiz-devel@lists.sourceforge.net\n" "\n" "This is the main community support channel.\n"