# HG changeset patch # User Andrey Skvortsov # Date 1503093524 -10800 # Node ID 38fde37c376656254b7add574ffc6a6338847480 # Parent c3679f96020b1f7f4e5302545c1e7a859fee6419 clean-up: fix PEP8 E124 closing bracket does not match visual indentation diff -r c3679f96020b -r 38fde37c3766 Beremiz_service.py --- a/Beremiz_service.py Sat Aug 19 00:30:22 2017 +0300 +++ b/Beremiz_service.py Sat Aug 19 00:58:44 2017 +0300 @@ -313,8 +313,7 @@ dlg = ParamsEntryDialog(None, _("Enter the IP of the interface to bind"), defaultValue=ip_addr) dlg.SetTests([(re.compile('\d{1,3}(?:\.\d{1,3}){3}$').match, _("IP is not valid!")), (lambda x:len([x for x in x.split(".") if 0 <= int(x) <= 255]) == 4, - _("IP is not valid!")) - ]) + _("IP is not valid!"))]) if dlg.ShowModal() == wx.ID_OK: self.pyroserver.ip_addr = dlg.GetValue() self.pyroserver.Stop() diff -r c3679f96020b -r 38fde37c3766 CodeFileTreeNode.py --- a/CodeFileTreeNode.py Sat Aug 19 00:30:22 2017 +0300 +++ b/CodeFileTreeNode.py Sat Aug 19 00:58:44 2017 +0300 @@ -159,13 +159,14 @@ def GetVariables(self): datas = [] for var in self.CodeFileVariables(self.CodeFile): - datas.append({"Name": var.getname(), - "Type": var.gettype(), - "Initial": var.getinitial(), - "Description": var.getdesc(), - "OnChange": var.getonchange(), - "Options": var.getopts(), - }) + datas.append({ + "Name": var.getname(), + "Type": var.gettype(), + "Initial": var.getinitial(), + "Description": var.getdesc(), + "OnChange": var.getonchange(), + "Options": var.getopts(), + }) return datas def SetTextParts(self, parts): diff -r c3679f96020b -r 38fde37c3766 IDEFrame.py --- a/IDEFrame.py Sat Aug 19 00:30:22 2017 +0300 +++ b/IDEFrame.py Sat Aug 19 00:58:44 2017 +0300 @@ -45,28 +45,31 @@ from util.BitmapLibrary import GetBitmap # Define PLCOpenEditor controls id -[ID_PLCOPENEDITOR, ID_PLCOPENEDITORLEFTNOTEBOOK, - ID_PLCOPENEDITORBOTTOMNOTEBOOK, ID_PLCOPENEDITORRIGHTNOTEBOOK, - ID_PLCOPENEDITORPROJECTTREE, ID_PLCOPENEDITORMAINSPLITTER, - ID_PLCOPENEDITORSECONDSPLITTER, ID_PLCOPENEDITORTHIRDSPLITTER, - ID_PLCOPENEDITORLIBRARYPANEL, ID_PLCOPENEDITORLIBRARYSEARCHCTRL, - ID_PLCOPENEDITORLIBRARYTREE, ID_PLCOPENEDITORLIBRARYCOMMENT, - ID_PLCOPENEDITORTABSOPENED, ID_PLCOPENEDITORTABSOPENED, - ID_PLCOPENEDITOREDITORMENUTOOLBAR, ID_PLCOPENEDITOREDITORTOOLBAR, - ID_PLCOPENEDITORPROJECTPANEL, +[ + ID_PLCOPENEDITOR, ID_PLCOPENEDITORLEFTNOTEBOOK, + ID_PLCOPENEDITORBOTTOMNOTEBOOK, ID_PLCOPENEDITORRIGHTNOTEBOOK, + ID_PLCOPENEDITORPROJECTTREE, ID_PLCOPENEDITORMAINSPLITTER, + ID_PLCOPENEDITORSECONDSPLITTER, ID_PLCOPENEDITORTHIRDSPLITTER, + ID_PLCOPENEDITORLIBRARYPANEL, ID_PLCOPENEDITORLIBRARYSEARCHCTRL, + ID_PLCOPENEDITORLIBRARYTREE, ID_PLCOPENEDITORLIBRARYCOMMENT, + ID_PLCOPENEDITORTABSOPENED, ID_PLCOPENEDITORTABSOPENED, + ID_PLCOPENEDITOREDITORMENUTOOLBAR, ID_PLCOPENEDITOREDITORTOOLBAR, + ID_PLCOPENEDITORPROJECTPANEL, ] = [wx.NewId() for _init_ctrls in range(17)] # Define PLCOpenEditor EditMenu extra items id -[ID_PLCOPENEDITOREDITMENUENABLEUNDOREDO, ID_PLCOPENEDITOREDITMENUADDDATATYPE, - ID_PLCOPENEDITOREDITMENUADDFUNCTION, ID_PLCOPENEDITOREDITMENUADDFUNCTIONBLOCK, - ID_PLCOPENEDITOREDITMENUADDPROGRAM, ID_PLCOPENEDITOREDITMENUADDCONFIGURATION, - ID_PLCOPENEDITOREDITMENUFINDNEXT, ID_PLCOPENEDITOREDITMENUFINDPREVIOUS, - ID_PLCOPENEDITOREDITMENUSEARCHINPROJECT, ID_PLCOPENEDITOREDITMENUADDRESOURCE +[ + ID_PLCOPENEDITOREDITMENUENABLEUNDOREDO, ID_PLCOPENEDITOREDITMENUADDDATATYPE, + ID_PLCOPENEDITOREDITMENUADDFUNCTION, ID_PLCOPENEDITOREDITMENUADDFUNCTIONBLOCK, + ID_PLCOPENEDITOREDITMENUADDPROGRAM, ID_PLCOPENEDITOREDITMENUADDCONFIGURATION, + ID_PLCOPENEDITOREDITMENUFINDNEXT, ID_PLCOPENEDITOREDITMENUFINDPREVIOUS, + ID_PLCOPENEDITOREDITMENUSEARCHINPROJECT, ID_PLCOPENEDITOREDITMENUADDRESOURCE ] = [wx.NewId() for _init_coll_EditMenu_Items in range(10)] # Define PLCOpenEditor DisplayMenu extra items id -[ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE, - ID_PLCOPENEDITORDISPLAYMENUSWITCHPERSPECTIVE, +[ + ID_PLCOPENEDITORDISPLAYMENURESETPERSPECTIVE, + ID_PLCOPENEDITORDISPLAYMENUSWITCHPERSPECTIVE, ] = [wx.NewId() for _init_coll_DisplayMenu_Items in range(2)] #------------------------------------------------------------------------------- @@ -74,15 +77,16 @@ #------------------------------------------------------------------------------- # Define PLCOpenEditor Toolbar items id -[ID_PLCOPENEDITOREDITORTOOLBARSELECTION, ID_PLCOPENEDITOREDITORTOOLBARCOMMENT, - ID_PLCOPENEDITOREDITORTOOLBARVARIABLE, ID_PLCOPENEDITOREDITORTOOLBARBLOCK, - ID_PLCOPENEDITOREDITORTOOLBARCONNECTION, ID_PLCOPENEDITOREDITORTOOLBARWIRE, - ID_PLCOPENEDITOREDITORTOOLBARPOWERRAIL, ID_PLCOPENEDITOREDITORTOOLBARRUNG, - ID_PLCOPENEDITOREDITORTOOLBARCOIL, ID_PLCOPENEDITOREDITORTOOLBARCONTACT, - ID_PLCOPENEDITOREDITORTOOLBARBRANCH, ID_PLCOPENEDITOREDITORTOOLBARINITIALSTEP, - ID_PLCOPENEDITOREDITORTOOLBARSTEP, ID_PLCOPENEDITOREDITORTOOLBARTRANSITION, - ID_PLCOPENEDITOREDITORTOOLBARACTIONBLOCK, ID_PLCOPENEDITOREDITORTOOLBARDIVERGENCE, - ID_PLCOPENEDITOREDITORTOOLBARJUMP, ID_PLCOPENEDITOREDITORTOOLBARMOTION, +[ + ID_PLCOPENEDITOREDITORTOOLBARSELECTION, ID_PLCOPENEDITOREDITORTOOLBARCOMMENT, + ID_PLCOPENEDITOREDITORTOOLBARVARIABLE, ID_PLCOPENEDITOREDITORTOOLBARBLOCK, + ID_PLCOPENEDITOREDITORTOOLBARCONNECTION, ID_PLCOPENEDITOREDITORTOOLBARWIRE, + ID_PLCOPENEDITOREDITORTOOLBARPOWERRAIL, ID_PLCOPENEDITOREDITORTOOLBARRUNG, + ID_PLCOPENEDITOREDITORTOOLBARCOIL, ID_PLCOPENEDITOREDITORTOOLBARCONTACT, + ID_PLCOPENEDITOREDITORTOOLBARBRANCH, ID_PLCOPENEDITOREDITORTOOLBARINITIALSTEP, + ID_PLCOPENEDITOREDITORTOOLBARSTEP, ID_PLCOPENEDITOREDITORTOOLBARTRANSITION, + ID_PLCOPENEDITOREDITORTOOLBARACTIONBLOCK, ID_PLCOPENEDITOREDITORTOOLBARDIVERGENCE, + ID_PLCOPENEDITOREDITORTOOLBARJUMP, ID_PLCOPENEDITOREDITORTOOLBARMOTION, ] = [wx.NewId() for _init_coll_DefaultEditorToolBar_Items in range(18)] @@ -216,8 +220,9 @@ parent.Append(helpString=help, id=id, kind=kind, item=text) -[TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, - POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES +[ + TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, + POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES ] = range(10) diff -r c3679f96020b -r 38fde37c3766 PLCControler.py --- a/PLCControler.py Sat Aug 19 00:30:22 2017 +0300 +++ b/PLCControler.py Sat Aug 19 00:58:44 2017 +0300 @@ -41,35 +41,38 @@ duration_model = re.compile("(?:([0-9]{1,2})h)?(?:([0-9]{1,2})m(?!s))?(?:([0-9]{1,2})s)?(?:([0-9]{1,3}(?:\.[0-9]*)?)ms)?") -ITEMS_EDITABLE = [ITEM_PROJECT, - ITEM_POU, - ITEM_VARIABLE, - ITEM_TRANSITION, - ITEM_ACTION, - ITEM_CONFIGURATION, - ITEM_RESOURCE, - ITEM_DATATYPE - ] = range(8) - -ITEMS_UNEDITABLE = [ITEM_DATATYPES, - ITEM_FUNCTION, - ITEM_FUNCTIONBLOCK, - ITEM_PROGRAM, - ITEM_TRANSITIONS, - ITEM_ACTIONS, - ITEM_CONFIGURATIONS, - ITEM_RESOURCES, - ITEM_PROPERTIES - ] = range(8, 17) - -ITEMS_VARIABLE = [ITEM_VAR_LOCAL, - ITEM_VAR_GLOBAL, - ITEM_VAR_EXTERNAL, - ITEM_VAR_TEMP, - ITEM_VAR_INPUT, - ITEM_VAR_OUTPUT, - ITEM_VAR_INOUT - ] = range(17, 24) +ITEMS_EDITABLE = [ + ITEM_PROJECT, + ITEM_POU, + ITEM_VARIABLE, + ITEM_TRANSITION, + ITEM_ACTION, + ITEM_CONFIGURATION, + ITEM_RESOURCE, + ITEM_DATATYPE +] = range(8) + +ITEMS_UNEDITABLE = [ + ITEM_DATATYPES, + ITEM_FUNCTION, + ITEM_FUNCTIONBLOCK, + ITEM_PROGRAM, + ITEM_TRANSITIONS, + ITEM_ACTIONS, + ITEM_CONFIGURATIONS, + ITEM_RESOURCES, + ITEM_PROPERTIES +] = range(8, 17) + +ITEMS_VARIABLE = [ + ITEM_VAR_LOCAL, + ITEM_VAR_GLOBAL, + ITEM_VAR_EXTERNAL, + ITEM_VAR_TEMP, + ITEM_VAR_INPUT, + ITEM_VAR_OUTPUT, + ITEM_VAR_INOUT +] = range(17, 24) VAR_CLASS_INFOS = { "Local": ("localVars", ITEM_VAR_LOCAL), @@ -80,10 +83,11 @@ "Output": ("outputVars", ITEM_VAR_OUTPUT), "InOut": ("inOutVars", ITEM_VAR_INOUT)} -POU_TYPES = {"program": ITEM_PROGRAM, - "functionBlock": ITEM_FUNCTIONBLOCK, - "function": ITEM_FUNCTION, - } +POU_TYPES = { + "program": ITEM_PROGRAM, + "functionBlock": ITEM_FUNCTIONBLOCK, + "function": ITEM_FUNCTION, +} LOCATIONS_ITEMS = [LOCATION_CONFNODE, LOCATION_MODULE, diff -r c3679f96020b -r 38fde37c3766 PLCOpenEditor.py --- a/PLCOpenEditor.py Sat Aug 19 00:30:22 2017 +0300 +++ b/PLCOpenEditor.py Sat Aug 19 00:58:44 2017 +0300 @@ -90,7 +90,8 @@ #------------------------------------------------------------------------------- # Define PLCOpenEditor FileMenu extra items id -[ID_PLCOPENEDITORFILEMENUGENERATE, +[ + ID_PLCOPENEDITORFILEMENUGENERATE, ] = [wx.NewId() for _init_coll_FileMenu_Items in range(1)] diff -r c3679f96020b -r 38fde37c3766 canfestival/NetworkEditor.py --- a/canfestival/NetworkEditor.py Sat Aug 19 00:30:22 2017 +0300 +++ b/canfestival/NetworkEditor.py Sat Aug 19 00:58:44 2017 +0300 @@ -28,21 +28,26 @@ from networkeditortemplate import NetworkEditorTemplate from editors.ConfTreeNodeEditor import ConfTreeNodeEditor -[ID_NETWORKEDITOR, +[ + ID_NETWORKEDITOR, ] = [wx.NewId() for _init_ctrls in range(1)] -[ID_NETWORKEDITORCONFNODEMENUADDSLAVE, ID_NETWORKEDITORCONFNODEMENUREMOVESLAVE, - ID_NETWORKEDITORCONFNODEMENUMASTER, +[ + ID_NETWORKEDITORCONFNODEMENUADDSLAVE, + ID_NETWORKEDITORCONFNODEMENUREMOVESLAVE, + ID_NETWORKEDITORCONFNODEMENUMASTER, ] = [wx.NewId() for _init_coll_ConfNodeMenu_Items in range(3)] -[ID_NETWORKEDITORMASTERMENUNODEINFOS, ID_NETWORKEDITORMASTERMENUDS301PROFILE, - ID_NETWORKEDITORMASTERMENUDS302PROFILE, ID_NETWORKEDITORMASTERMENUDSOTHERPROFILE, - ID_NETWORKEDITORMASTERMENUADD, +[ + ID_NETWORKEDITORMASTERMENUNODEINFOS, ID_NETWORKEDITORMASTERMENUDS301PROFILE, + ID_NETWORKEDITORMASTERMENUDS302PROFILE, ID_NETWORKEDITORMASTERMENUDSOTHERPROFILE, + ID_NETWORKEDITORMASTERMENUADD, ] = [wx.NewId() for _init_coll_MasterMenu_Items in range(5)] -[ID_NETWORKEDITORADDMENUSDOSERVER, ID_NETWORKEDITORADDMENUSDOCLIENT, - ID_NETWORKEDITORADDMENUPDOTRANSMIT, ID_NETWORKEDITORADDMENUPDORECEIVE, - ID_NETWORKEDITORADDMENUMAPVARIABLE, ID_NETWORKEDITORADDMENUUSERTYPE, +[ + ID_NETWORKEDITORADDMENUSDOSERVER, ID_NETWORKEDITORADDMENUSDOCLIENT, + ID_NETWORKEDITORADDMENUPDOTRANSMIT, ID_NETWORKEDITORADDMENUPDORECEIVE, + ID_NETWORKEDITORADDMENUMAPVARIABLE, ID_NETWORKEDITORADDMENUUSERTYPE, ] = [wx.NewId() for _init_coll_AddMenu_Items in range(6)] diff -r c3679f96020b -r 38fde37c3766 canfestival/SlaveEditor.py --- a/canfestival/SlaveEditor.py Sat Aug 19 00:30:22 2017 +0300 +++ b/canfestival/SlaveEditor.py Sat Aug 19 00:58:44 2017 +0300 @@ -28,14 +28,16 @@ from nodeeditortemplate import NodeEditorTemplate from editors.ConfTreeNodeEditor import ConfTreeNodeEditor -[ID_SLAVEEDITORCONFNODEMENUNODEINFOS, ID_SLAVEEDITORCONFNODEMENUDS301PROFILE, - ID_SLAVEEDITORCONFNODEMENUDS302PROFILE, ID_SLAVEEDITORCONFNODEMENUDSOTHERPROFILE, - ID_SLAVEEDITORCONFNODEMENUADD, +[ + ID_SLAVEEDITORCONFNODEMENUNODEINFOS, ID_SLAVEEDITORCONFNODEMENUDS301PROFILE, + ID_SLAVEEDITORCONFNODEMENUDS302PROFILE, ID_SLAVEEDITORCONFNODEMENUDSOTHERPROFILE, + ID_SLAVEEDITORCONFNODEMENUADD, ] = [wx.NewId() for _init_coll_ConfNodeMenu_Items in range(5)] -[ID_SLAVEEDITORADDMENUSDOSERVER, ID_SLAVEEDITORADDMENUSDOCLIENT, - ID_SLAVEEDITORADDMENUPDOTRANSMIT, ID_SLAVEEDITORADDMENUPDORECEIVE, - ID_SLAVEEDITORADDMENUMAPVARIABLE, ID_SLAVEEDITORADDMENUUSERTYPE, +[ + ID_SLAVEEDITORADDMENUSDOSERVER, ID_SLAVEEDITORADDMENUSDOCLIENT, + ID_SLAVEEDITORADDMENUPDOTRANSMIT, ID_SLAVEEDITORADDMENUPDORECEIVE, + ID_SLAVEEDITORADDMENUMAPVARIABLE, ID_SLAVEEDITORADDMENUUSERTYPE, ] = [wx.NewId() for _init_coll_AddMenu_Items in range(6)] diff -r c3679f96020b -r 38fde37c3766 canfestival/canfestival.py --- a/canfestival/canfestival.py Sat Aug 19 00:30:22 2017 +0300 +++ b/canfestival/canfestival.py Sat Aug 19 00:58:44 2017 +0300 @@ -80,8 +80,7 @@ return {"name": name, "type": LOCATION_CONFNODE, "location": ".".join([str(i) for i in current_location]) + ".x", - "children": entries - } + "children": entries} #-------------------------------------------------- # SLAVE diff -r c3679f96020b -r 38fde37c3766 connectors/__init__.py --- a/connectors/__init__.py Sat Aug 19 00:30:22 2017 +0300 +++ b/connectors/__init__.py Sat Aug 19 00:58:44 2017 +0300 @@ -39,8 +39,7 @@ _GetLocalConnectorClassFactory(name) for name in listdir(_base_path) if (path.isdir(path.join(_base_path, name)) - and not name.startswith("__")) -} + and not name.startswith("__"))} def ConnectorFactory(uri, confnodesroot): diff -r c3679f96020b -r 38fde37c3766 controls/ProjectPropertiesPanel.py --- a/controls/ProjectPropertiesPanel.py Sat Aug 19 00:30:22 2017 +0300 +++ b/controls/ProjectPropertiesPanel.py Sat Aug 19 00:58:44 2017 +0300 @@ -31,8 +31,9 @@ REQUIRED_PARAMS = ["projectName", "productName", "productVersion", "companyName"] -[TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, - POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES +[ + TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, + POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES ] = range(10) #------------------------------------------------------------------------------- diff -r c3679f96020b -r 38fde37c3766 controls/SearchResultPanel.py --- a/controls/SearchResultPanel.py Sat Aug 19 00:30:22 2017 +0300 +++ b/controls/SearchResultPanel.py Sat Aug 19 00:58:44 2017 +0300 @@ -46,8 +46,9 @@ #------------------------------------------------------------------------------- -[ID_SEARCHRESULTPANEL, ID_SEARCHRESULTPANELHEADERLABEL, - ID_SEARCHRESULTPANELSEARCHRESULTSTREE, ID_SEARCHRESULTPANELRESETBUTTON, +[ + ID_SEARCHRESULTPANEL, ID_SEARCHRESULTPANELHEADERLABEL, + ID_SEARCHRESULTPANELSEARCHRESULTSTREE, ID_SEARCHRESULTPANELRESETBUTTON, ] = [wx.NewId() for _init_ctrls in range(4)] @@ -174,12 +175,13 @@ self.ResetButton.Enable(False) else: matches_number = 0 - search_results_tree_infos = {"name": _("Project '%s':") % self.ParentWindow.Controler.GetProjectName(), - "type": ITEM_PROJECT, - "data": None, - "text": None, - "matches": None, - } + search_results_tree_infos = { + "name": _("Project '%s':") % self.ParentWindow.Controler.GetProjectName(), + "type": ITEM_PROJECT, + "data": None, + "text": None, + "matches": None, + } search_results_tree_children = search_results_tree_infos.setdefault("children", []) for tagname in self.ElementsOrder: results = self.SearchResults.get(tagname, []) @@ -219,13 +221,14 @@ child_type = self.ParentWindow.Controler.GetPouBodyType(words[1]) else: child_name = GenerateName(infos[3:]) - child_infos = {"name": child_name, - "type": child_type, - "data": (infos, start, end, None), - "text": text, - "matches": 1, - "children": [], - } + child_infos = { + "name": child_name, + "type": child_type, + "data": (infos, start, end, None), + "text": text, + "matches": 1, + "children": [], + } children.append(child_infos) if len(words) > 2: diff -r c3679f96020b -r 38fde37c3766 controls/VariablePanel.py --- a/controls/VariablePanel.py Sat Aug 19 00:30:22 2017 +0300 +++ b/controls/VariablePanel.py Sat Aug 19 00:58:44 2017 +0300 @@ -43,8 +43,9 @@ # Helpers #------------------------------------------------------------------------------- -[TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, - POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES +[ + TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, + POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES ] = range(10) @@ -89,14 +90,15 @@ VARIABLE_CHOICES_DICT = dict([(_(_class), _class) for _class in GetFilterChoiceTransfer().iterkeys()]) VARIABLE_CLASSES_DICT = dict([(_(_class), _class) for _class in GetFilterChoiceTransfer().itervalues()]) -CheckOptionForClass = {"Local": lambda x: x, - "Temp": lambda x: "", - "Input": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""), - "InOut": lambda x: "", - "Output": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""), - "Global": lambda x: {"Constant": "Constant", "Retain": "Retain"}.get(x, ""), - "External": lambda x: {"Constant": "Constant"}.get(x, "") - } +CheckOptionForClass = { + "Local": lambda x: x, + "Temp": lambda x: "", + "Input": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""), + "InOut": lambda x: "", + "Output": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(x, ""), + "Global": lambda x: {"Constant": "Constant", "Retain": "Retain"}.get(x, ""), + "External": lambda x: {"Constant": "Constant"}.get(x, "") +} LOCATION_MODEL = re.compile("((?:%[IQM](?:\*|(?:[XBWLD]?[0-9]+(?:\.[0-9]+)*)))?)$") VARIABLE_NAME_SUFFIX_MODEL = re.compile("([0-9]*)$") diff -r c3679f96020b -r 38fde37c3766 dialogs/DiscoveryDialog.py --- a/dialogs/DiscoveryDialog.py Sat Aug 19 00:30:22 2017 +0300 +++ b/dialogs/DiscoveryDialog.py Sat Aug 19 00:58:44 2017 +0300 @@ -40,9 +40,10 @@ listmix.ListCtrlAutoWidthMixin.__init__(self) -[ID_DISCOVERYDIALOG, ID_DISCOVERYDIALOGSTATICTEXT1, - ID_DISCOVERYDIALOGSERVICESLIST, ID_DISCOVERYDIALOGREFRESHBUTTON, - ID_DISCOVERYDIALOGLOCALBUTTON, ID_DISCOVERYDIALOGIPBUTTON, +[ + ID_DISCOVERYDIALOG, ID_DISCOVERYDIALOGSTATICTEXT1, + ID_DISCOVERYDIALOGSERVICESLIST, ID_DISCOVERYDIALOGREFRESHBUTTON, + ID_DISCOVERYDIALOGLOCALBUTTON, ID_DISCOVERYDIALOGIPBUTTON, ] = [wx.NewId() for _init_ctrls in range(6)] diff -r c3679f96020b -r 38fde37c3766 editors/ResourceEditor.py --- a/editors/ResourceEditor.py Sat Aug 19 00:30:22 2017 +0300 +++ b/editors/ResourceEditor.py Sat Aug 19 00:58:44 2017 +0300 @@ -37,7 +37,8 @@ # Configuration Editor class #------------------------------------------------------------------------------- -[ID_CONFIGURATIONEDITOR, +[ + ID_CONFIGURATIONEDITOR, ] = [wx.NewId() for _init_ctrls in range(1)] diff -r c3679f96020b -r 38fde37c3766 editors/TextViewer.py --- a/editors/TextViewer.py Sat Aug 19 00:30:22 2017 +0300 +++ b/editors/TextViewer.py Sat Aug 19 00:58:44 2017 +0300 @@ -51,7 +51,8 @@ STC_PLC_EMPTY] = range(11) [SPACE, WORD, NUMBER, STRING, WSTRING, COMMENT, PRAGMA, DPRAGMA] = range(8) -[ID_TEXTVIEWER, ID_TEXTVIEWERTEXTCTRL, +[ + ID_TEXTVIEWER, ID_TEXTVIEWERTEXTCTRL, ] = [wx.NewId() for _init_ctrls in range(2)] re_texts = {} diff -r c3679f96020b -r 38fde37c3766 editors/Viewer.py --- a/editors/Viewer.py Sat Aug 19 00:30:22 2017 +0300 +++ b/editors/Viewer.py Sat Aug 19 00:58:44 2017 +0300 @@ -233,19 +233,21 @@ # ID Constants for alignment menu items -[ID_VIEWERALIGNMENTMENUITEMS0, ID_VIEWERALIGNMENTMENUITEMS1, - ID_VIEWERALIGNMENTMENUITEMS2, ID_VIEWERALIGNMENTMENUITEMS4, - ID_VIEWERALIGNMENTMENUITEMS5, ID_VIEWERALIGNMENTMENUITEMS6, +[ + ID_VIEWERALIGNMENTMENUITEMS0, ID_VIEWERALIGNMENTMENUITEMS1, + ID_VIEWERALIGNMENTMENUITEMS2, ID_VIEWERALIGNMENTMENUITEMS4, + ID_VIEWERALIGNMENTMENUITEMS5, ID_VIEWERALIGNMENTMENUITEMS6, ] = [wx.NewId() for _init_coll_AlignmentMenu_Items in range(6)] # ID Constants for contextual menu items -[ID_VIEWERCONTEXTUALMENUITEMS0, ID_VIEWERCONTEXTUALMENUITEMS1, - ID_VIEWERCONTEXTUALMENUITEMS2, ID_VIEWERCONTEXTUALMENUITEMS3, - ID_VIEWERCONTEXTUALMENUITEMS5, ID_VIEWERCONTEXTUALMENUITEMS6, - ID_VIEWERCONTEXTUALMENUITEMS8, ID_VIEWERCONTEXTUALMENUITEMS9, - ID_VIEWERCONTEXTUALMENUITEMS11, ID_VIEWERCONTEXTUALMENUITEMS12, - ID_VIEWERCONTEXTUALMENUITEMS14, ID_VIEWERCONTEXTUALMENUITEMS16, - ID_VIEWERCONTEXTUALMENUITEMS17, +[ + ID_VIEWERCONTEXTUALMENUITEMS0, ID_VIEWERCONTEXTUALMENUITEMS1, + ID_VIEWERCONTEXTUALMENUITEMS2, ID_VIEWERCONTEXTUALMENUITEMS3, + ID_VIEWERCONTEXTUALMENUITEMS5, ID_VIEWERCONTEXTUALMENUITEMS6, + ID_VIEWERCONTEXTUALMENUITEMS8, ID_VIEWERCONTEXTUALMENUITEMS9, + ID_VIEWERCONTEXTUALMENUITEMS11, ID_VIEWERCONTEXTUALMENUITEMS12, + ID_VIEWERCONTEXTUALMENUITEMS14, ID_VIEWERCONTEXTUALMENUITEMS16, + ID_VIEWERCONTEXTUALMENUITEMS17, ] = [wx.NewId() for _init_coll_ContextualMenu_Items in range(13)] @@ -572,8 +574,9 @@ # Add Alignment Menu items to the given menu def AddAlignmentMenuItems(self, menu): - [ID_ALIGN_LEFT, ID_ALIGN_CENTER, ID_ALIGN_RIGHT, - ID_ALIGN_TOP, ID_ALIGN_MIDDLE, ID_ALIGN_BOTTOM, + [ + ID_ALIGN_LEFT, ID_ALIGN_CENTER, ID_ALIGN_RIGHT, + ID_ALIGN_TOP, ID_ALIGN_MIDDLE, ID_ALIGN_BOTTOM, ] = [wx.NewId() for i in xrange(6)] # Create menu items @@ -624,7 +627,8 @@ None]) if self.CurrentLanguage != "FBD": - [ID_ADD_POWER_RAIL, ID_ADD_CONTACT, ID_ADD_COIL, + [ + ID_ADD_POWER_RAIL, ID_ADD_CONTACT, ID_ADD_COIL, ] = [wx.NewId() for i in xrange(3)] # Create menu items @@ -639,8 +643,9 @@ menu.AppendSeparator() if self.CurrentLanguage == "SFC": - [ID_ADD_INITIAL_STEP, ID_ADD_STEP, ID_ADD_TRANSITION, - ID_ADD_ACTION_BLOCK, ID_ADD_DIVERGENCE, ID_ADD_JUMP, + [ + ID_ADD_INITIAL_STEP, ID_ADD_STEP, ID_ADD_TRANSITION, + ID_ADD_ACTION_BLOCK, ID_ADD_DIVERGENCE, ID_ADD_JUMP, ] = [wx.NewId() for i in xrange(6)] # Create menu items diff -r c3679f96020b -r 38fde37c3766 svgui/pyjs/build.py --- a/svgui/pyjs/build.py Sat Aug 19 00:30:22 2017 +0300 +++ b/svgui/pyjs/build.py Sat Aug 19 00:58:44 2017 +0300 @@ -672,57 +672,66 @@ global app_platforms parser = OptionParser(usage=usage, version=version) - parser.add_option("-o", - "--output", - dest="output", - help="directory to which the webapp should be written" - ) - parser.add_option("-j", - "--include-js", - dest="js_includes", - action="append", - help="javascripts to load into the same frame as the rest of the script" - ) - parser.add_option("-I", - "--library_dir", - dest="library_dirs", - action="append", - help="additional paths appended to PYJSPATH" - ) - parser.add_option("-D", - "--data_dir", - dest="data_dir", - help="path for data directory" - ) - parser.add_option("-m", - "--dynamic-modules", - action="store_true", - dest="dynamic", - default=False, - help="Split output into separate dynamically-loaded modules (experimental)" - ) - parser.add_option("-P", - "--platforms", - dest="platforms", - help="platforms to build for, comma-separated" - ) - parser.add_option("-d", - "--debug", - action="store_true", - dest="debug" - ) - parser.add_option("-O", - "--optimize", - action="store_true", - dest="optimize", - default=False, - help="Optimize generated code (removes all print statements)", - ) - parser.add_option("-c", - "--cache_buster", - action="store_true", - dest="cache_buster", - help="Enable browser cache-busting (MD5 hash added to output filenames)" + parser.add_option( + "-o", + "--output", + dest="output", + help="directory to which the webapp should be written" + ) + parser.add_option( + "-j", + "--include-js", + dest="js_includes", + action="append", + help="javascripts to load into the same frame as the rest of the script" + ) + parser.add_option( + "-I", + "--library_dir", + dest="library_dirs", + action="append", + help="additional paths appended to PYJSPATH" + ) + parser.add_option( + "-D", + "--data_dir", + dest="data_dir", + help="path for data directory" + ) + parser.add_option( + "-m", + "--dynamic-modules", + action="store_true", + dest="dynamic", + default=False, + help="Split output into separate dynamically-loaded modules (experimental)" + ) + parser.add_option( + "-P", + "--platforms", + dest="platforms", + help="platforms to build for, comma-separated" + ) + parser.add_option( + "-d", + "--debug", + action="store_true", + dest="debug" + ) + parser.add_option( + "-O", + "--optimize", + action="store_true", + dest="optimize", + default=False, + help="Optimize generated code (removes all print statements)", + ) + parser.add_option( + "-c", + "--cache_buster", + action="store_true", + dest="cache_buster", + help="Enable browser cache-busting (MD5 hash added to output filenames)" ) parser.set_defaults(output="output", js_includes=[], library_dirs=[], diff -r c3679f96020b -r 38fde37c3766 svgui/pyjs/jsonrpc/jsonrpc.py --- a/svgui/pyjs/jsonrpc/jsonrpc.py Sat Aug 19 00:30:22 2017 +0300 +++ b/svgui/pyjs/jsonrpc/jsonrpc.py Sat Aug 19 00:58:44 2017 +0300 @@ -13,13 +13,13 @@ 'result': result, 'error': None}) def error(self, id, code, message): - return simplejson.dumps({'id': id, - 'version': '1.1', - 'error': {'name': 'JSONRPCError', - 'code': code, - 'message': message - } - }) + return simplejson.dumps({ + 'id': id, + 'version': '1.1', + 'error': {'name': 'JSONRPCError', + 'code': code, + 'message': message} + }) def add_method(self, name, method): self.methods[name] = method diff -r c3679f96020b -r 38fde37c3766 svgui/pyjs/pyjs.py --- a/svgui/pyjs/pyjs.py Sat Aug 19 00:30:22 2017 +0300 +++ b/svgui/pyjs/pyjs.py Sat Aug 19 00:58:44 2017 +0300 @@ -87,8 +87,7 @@ "list", "dict", "object", - "tuple", -) + "tuple") def pyjs_builtin_remap(name): diff -r c3679f96020b -r 38fde37c3766 svgui/svgui.py --- a/svgui/svgui.py Sat Aug 19 00:30:22 2017 +0300 +++ b/svgui/svgui.py Sat Aug 19 00:58:44 2017 +0300 @@ -124,8 +124,7 @@ """ % {"location": location_str, "svgui_class": "SVGUI_HMI", - "jsmodules": str(jsmodules), - }) + "jsmodules": str(jsmodules)}) runtimefile.close() res += (("runtime_%s.py" % location_str, file(runtimefile_path, "rb")),) diff -r c3679f96020b -r 38fde37c3766 targets/toolchain_makefile.py --- a/targets/toolchain_makefile.py Sat Aug 19 00:30:22 2017 +0300 +++ b/targets/toolchain_makefile.py Sat Aug 19 00:58:44 2017 +0300 @@ -109,8 +109,7 @@ beremizcommand = {"src": ' '.join(srcfiles), "cflags": ' '.join(cflags), "md5": self.md5key, - "buildpath": self.buildpath - } + "buildpath": self.buildpath} # clean sequence of multiple whitespaces cmd = re.sub(r"[ ]+", " ", target.getCommand().strip()) diff -r c3679f96020b -r 38fde37c3766 xmlclass/xmlclass.py --- a/xmlclass/xmlclass.py Sat Aug 19 00:30:22 2017 +0300 +++ b/xmlclass/xmlclass.py Sat Aug 19 00:58:44 2017 +0300 @@ -100,8 +100,9 @@ return ZERO -[SYNTAXELEMENT, SYNTAXATTRIBUTE, SIMPLETYPE, COMPLEXTYPE, COMPILEDCOMPLEXTYPE, - ATTRIBUTESGROUP, ELEMENTSGROUP, ATTRIBUTE, ELEMENT, CHOICE, ANY, TAG, CONSTRAINT, +[ + SYNTAXELEMENT, SYNTAXATTRIBUTE, SIMPLETYPE, COMPLEXTYPE, COMPILEDCOMPLEXTYPE, + ATTRIBUTESGROUP, ELEMENTSGROUP, ATTRIBUTE, ELEMENT, CHOICE, ANY, TAG, CONSTRAINT, ] = range(13) @@ -1166,9 +1167,10 @@ class_definition = classobj(str(name), bases, classmembers) setattr(class_definition, "__getattr__", generateGetattrMethod(self, class_definition, classinfos)) setattr(class_definition, "__setattr__", generateSetattrMethod(self, class_definition, classinfos)) - class_infos = {"type": COMPILEDCOMPLEXTYPE, - "name": classname, - "initial": generateClassCreateFunction(class_definition), + class_infos = { + "type": COMPILEDCOMPLEXTYPE, + "name": classname, + "initial": generateClassCreateFunction(class_definition), } if self.FileName is not None: