clean-up: fix PEP8 E124 closing bracket does not match visual indentation
--- 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!"))]) if dlg.ShowModal() == wx.ID_OK:
self.pyroserver.ip_addr = dlg.GetValue()
--- 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 @@
for var in self.CodeFileVariables(self.CodeFile):
- datas.append({"Name": var.getname(),
- "Initial": var.getinitial(),
- "Description": var.getdesc(),
- "OnChange": var.getonchange(),
- "Options": var.getopts(),
+ "Initial": var.getinitial(), + "Description": var.getdesc(), + "OnChange": var.getonchange(), + "Options": var.getopts(), def SetTextParts(self, parts):
--- 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 --- 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,
-ITEMS_UNEDITABLE = [ITEM_DATATYPES,
-ITEMS_VARIABLE = [ITEM_VAR_LOCAL,
"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,
+ "program": ITEM_PROGRAM, + "functionBlock": ITEM_FUNCTIONBLOCK, + "function": ITEM_FUNCTION, LOCATIONS_ITEMS = [LOCATION_CONFNODE,
--- 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)]
--- 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
] = [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)]
--- 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)]
--- 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 @@
"type": LOCATION_CONFNODE,
"location": ".".join([str(i) for i in current_location]) + ".x",
#--------------------------------------------------
--- 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):
--- 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 #-------------------------------------------------------------------------------
--- 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)
- search_results_tree_infos = {"name": _("Project '%s':") % self.ParentWindow.Controler.GetProjectName(),
+ search_results_tree_infos = { + "name": _("Project '%s':") % self.ParentWindow.Controler.GetProjectName(), 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])
child_name = GenerateName(infos[3:])
- child_infos = {"name": child_name,
- "data": (infos, start, end, None),
+ "data": (infos, start, end, None), children.append(child_infos)
--- 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 @@
#-------------------------------------------------------------------------------
-[TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE,
- POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES
+ TITLE, EDITORTOOLBAR, FILEMENU, EDITMENU, DISPLAYMENU, PROJECTTREE, + POUINSTANCEVARIABLESPANEL, LIBRARYTREE, SCALING, PAGETITLES @@ -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,
- "Input": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(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, "")
+ "Input": lambda x: {"Retain": "Retain", "Non-Retain": "Non-Retain"}.get(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]*)$")
--- 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)]
--- 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)]
--- 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)]
--- 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)]
@@ -624,7 +627,8 @@
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)]
@@ -639,8 +643,9 @@
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)]
--- 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 @@
parser = OptionParser(usage=usage, version=version)
- parser.add_option("-o",
- help="directory to which the webapp should be written"
+ help="directory to which the webapp should be written" - parser.add_option("-j",
- help="javascripts to load into the same frame as the rest of the script"
+ help="javascripts to load into the same frame as the rest of the script" - parser.add_option("-I",
- help="additional paths appended to PYJSPATH"
+ help="additional paths appended to PYJSPATH" - parser.add_option("-D",
- help="path for data directory"
+ help="path for data directory" - parser.add_option("-m",
- help="Split output into separate dynamically-loaded modules (experimental)"
+ help="Split output into separate dynamically-loaded modules (experimental)" - parser.add_option("-P",
- help="platforms to build for, comma-separated"
+ help="platforms to build for, comma-separated" - parser.add_option("-d",
- parser.add_option("-O",
- help="Optimize generated code (removes all print statements)",
+ help="Optimize generated code (removes all print statements)", - parser.add_option("-c",
- help="Enable browser cache-busting (MD5 hash added to output filenames)"
+ help="Enable browser cache-busting (MD5 hash added to output filenames)" parser.set_defaults(output="output", js_includes=[], library_dirs=[],
--- 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,
- 'error': {'name': 'JSONRPCError',
+ return simplejson.dumps({ + 'error': {'name': 'JSONRPCError', def add_method(self, name, method):
self.methods[name] = method
--- 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 @@
def pyjs_builtin_remap(name):
--- 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)}) res += (("runtime_%s.py" % location_str, file(runtimefile_path, "rb")),)
--- 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),
- "buildpath": self.buildpath
+ "buildpath": self.buildpath} # clean sequence of multiple whitespaces
cmd = re.sub(r"[ ]+", " ", target.getCommand().strip())
--- 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 @@
-[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, @@ -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,
- "initial": generateClassCreateFunction(class_definition),
+ "type": COMPILEDCOMPLEXTYPE, + "initial": generateClassCreateFunction(class_definition), if self.FileName is not None: