--- a/ProjectController.py Wed Aug 16 16:37:45 2017 +0300
+++ b/ProjectController.py Wed Aug 16 17:27:58 2017 +0300
@@ -307,7 +307,7 @@
def CTNTestModified(self):
- return self.ChangesToSave or not self.ProjectIsSaved()
+ return self.ChangesToSave or not self.ProjectIsSaved() @@ -1154,7 +1154,7 @@
code_path = os.path.join(buildpath, filename)
open(code_path, "w").write(code)
# Insert this file as first file to be compiled at root confnode
--- a/controls/DebugVariablePanel/DebugVariableGraphicViewer.py Wed Aug 16 16:37:45 2017 +0300
+++ b/controls/DebugVariablePanel/DebugVariableGraphicViewer.py Wed Aug 16 17:27:58 2017 +0300
@@ -438,7 +438,7 @@
# will be set in reverse order
buttons = self.ContextualButtons[:]
if direction in [wx.TOP, wx.LEFT]:
# Set contextual menu buttons position aside rect depending on
--- a/dialogs/SFCDivergenceDialog.py Wed Aug 16 16:37:45 2017 +0300
+++ b/dialogs/SFCDivergenceDialog.py Wed Aug 16 17:27:58 2017 +0300
@@ -67,8 +67,8 @@
(SIMULTANEOUS_CONVERGENCE, _('Simultaneous Convergence'))]
if poss_div_types is not None:
- for val in poss_div_types:
- poss_div_btns.append(divergence_buttons[val])
+ for val in poss_div_types: + poss_div_btns.append(divergence_buttons[val]) poss_div_btns = divergence_buttons
self.TypeRadioButtons = {}
--- a/editors/Viewer.py Wed Aug 16 16:37:45 2017 +0300
+++ b/editors/Viewer.py Wed Aug 16 17:27:58 2017 +0300
@@ -3714,7 +3714,7 @@
for wire in self.Wires.iterkeys():
if wire != self.SelectedElement and (wire.IsVisible() or printing):
- if not self.Debug or wire.GetValue() != True:
+ if not self.Debug or wire.GetValue() != True: for wire in self.Wires.iterkeys():
--- a/graphics/SFC_Objects.py Wed Aug 16 16:37:45 2017 +0300
+++ b/graphics/SFC_Objects.py Wed Aug 16 17:27:58 2017 +0300
@@ -815,7 +815,7 @@
def SetType(self, type, condition=None):
if self.Type == "connection":
- self.Condition.UnConnect(delete=self.Parent.GetDrawingMode() == FREEDRAWING_MODE)
+ self.Condition.UnConnect(delete=self.Parent.GetDrawingMode() == FREEDRAWING_MODE) self.Condition = Connector(self, "", "BOOL", wx.Point(0, self.Size[1] / 2), WEST)
--- a/svgui/pyjs/build.py Wed Aug 16 16:37:45 2017 +0300
+++ b/svgui/pyjs/build.py Wed Aug 16 17:27:58 2017 +0300
@@ -723,7 +723,7 @@
pyjs.path.append(abspath(d))
- app_platforms = options.platforms.split(',')
+ app_platforms = options.platforms.split(',') # this is mostly for getting boilerplate stuff
data_dir = os.path.abspath(options.data_dir)
--- a/svgui/pyjs/pyjs.py Wed Aug 16 16:37:45 2017 +0300
+++ b/svgui/pyjs/pyjs.py Wed Aug 16 17:27:58 2017 +0300
@@ -284,9 +284,9 @@
if importName == '__pyjamas__': # special module to help make pyjamas modules loadable in the python interpreter
elif importName.endswith('.js'):
- self.imported_js.add(importName)
+ self.imported_js.add(importName) - self.add_imported_module(strip_py(importName))
+ self.add_imported_module(strip_py(importName)) elif isinstance(child, ast.From):
if child.modname == '__pyjamas__': # special module to help make pyjamas modules loadable in the python interpreter
@@ -310,9 +310,9 @@
elif isinstance(child, ast.Global):
self._global(child, None)
elif isinstance(child, ast.Printnl):
- self._print(child, None)
+ self._print(child, None) elif isinstance(child, ast.Print):
- self._print(child, None)
+ self._print(child, None) elif isinstance(child, ast.TryExcept):
self._tryExcept(child, None)
elif isinstance(child, ast.Raise):
@@ -997,9 +997,9 @@
elif isinstance(node, ast.Function):
self._function(node, True)
elif isinstance(node, ast.Printnl):
- self._print(node, current_klass)
+ self._print(node, current_klass) elif isinstance(node, ast.Print):
- self._print(node, current_klass)
+ self._print(node, current_klass) elif isinstance(node, ast.TryExcept):
self._tryExcept(node, current_klass)
elif isinstance(node, ast.Raise):
@@ -1066,8 +1066,8 @@
tnode = ast.Assign([ast.AssName(tempvar, "OP_ASSIGN", node.lineno)], node.expr, node.lineno)
self._assign(tnode, current_klass, top_level)
- tnode2 = ast.Assign([v], ast.Name(tempvar, node.lineno), node.lineno)
- self._assign(tnode2, current_klass, top_level)
+ tnode2 = ast.Assign([v], ast.Name(tempvar, node.lineno), node.lineno) + self._assign(tnode2, current_klass, top_level) @@ -1177,7 +1177,7 @@
debugStmt = self.debug and not self._isNativeFunc(node)
if debugStmt and isinstance(node.expr.node, ast.Name) and \
node.expr.node.name == 'import_wait':
st = self.get_line_trace(node)
print >>self.output, "sys.addstack('%s');\n" % st
@@ -1383,8 +1383,8 @@
def _mod(self, node, current_klass):
if isinstance(node.left, ast.Const) and isinstance(node.left.value, StringType):
- self.imported_js.add("sprintf.js") # Include the sprintf functionality if it is used
- return "sprintf("+self.expr(node.left, current_klass) + ", " + self.expr(node.right, current_klass)+")"
+ self.imported_js.add("sprintf.js") # Include the sprintf functionality if it is used + return "sprintf("+self.expr(node.left, current_klass) + ", " + self.expr(node.right, current_klass)+")" return self.expr(node.left, current_klass) + " % " + self.expr(node.right, current_klass)
def _invert(self, node, current_klass):
@@ -1738,15 +1738,15 @@
print >> app_code, self._translate(
module_name, is_app, debug=debug, imported_js=imported_js)
- path = self.findFile(js)
- if os.path.isfile(path):
- print 'Including JS', js
- print >> lib_code, '\n//\n// BEGIN JS '+js+'\n//\n'
- print >> lib_code, file(path).read()
- print >> lib_code, '\n//\n// END JS '+js+'\n//\n'
- print >>sys.stderr, 'Warning: Unable to find imported javascript:', js
+ path = self.findFile(js) + if os.path.isfile(path): + print 'Including JS', js + print >> lib_code, '\n//\n// BEGIN JS '+js+'\n//\n' + print >> lib_code, file(path).read() + print >> lib_code, '\n//\n// END JS '+js+'\n//\n' + print >>sys.stderr, 'Warning: Unable to find imported javascript:', js return lib_code.getvalue(), app_code.getvalue()
--- a/targets/__init__.py Wed Aug 16 16:37:45 2017 +0300
+++ b/targets/__init__.py Wed Aug 16 17:27:58 2017 +0300
@@ -68,9 +68,8 @@
for toolchainname, xsdfilename in toolchains.iteritems():
- if path.isfile(xsdfilename):
- DictXSD_toolchain["toolchain_"+toolchainname] = \
- open(xsdfilename).read()
+ if path.isfile(xsdfilename): + DictXSD_toolchain["toolchain_"+toolchainname] = open(xsdfilename).read() for targetname, nfo in targets.iteritems():
--- a/xmlclass/xsdschema.py Wed Aug 16 16:37:45 2017 +0300
+++ b/xmlclass/xsdschema.py Wed Aug 16 17:27:58 2017 +0300
@@ -281,7 +281,7 @@
raise ValueError("\"minExclusive\" must be lesser than \"maxExclusive\"!")
elif facettype == "whiteSpace":
if basevalue == "collapse" and value in ["preserve", "replace"] or basevalue == "replace" and value == "preserve":
- raise ValueError("\"whiteSpace\" is incompatible with \"whiteSpace\" defined in base type!")
+ raise ValueError("\"whiteSpace\" is incompatible with \"whiteSpace\" defined in base type!") elif facettype == "totalDigits":
if facets.has_key("fractionDigits") and value <= facets["fractionDigits"][0]:
raise ValueError("\"fractionDigits\" must be lesser than or equal to \"totalDigits\"!")