--- a/ProjectController.py Sat Aug 19 16:30:15 2017 +0300
+++ b/ProjectController.py Sat Aug 19 16:45:37 2017 +0300
@@ -1728,9 +1728,7 @@
self.logger.write_error(_("Connection canceled!\n"))
return
else:
- self.\
- BeremizRoot.\
- setURI_location(uri)
+ self.BeremizRoot.setURI_location(uri)
self.ChangesToSave = True
if self._View is not None:
self._View.RefreshView()
--- a/controls/VariablePanel.py Sat Aug 19 16:30:15 2017 +0300
+++ b/controls/VariablePanel.py Sat Aug 19 16:45:37 2017 +0300
@@ -515,7 +515,7 @@
self.DefaultTypes = {"All": "Local", "Interface": "Input", "Variables": "Local"}
if element_type in ["config", "resource"] \
- or element_type in ["program", "transition", "action"]:
+ or element_type in ["program", "transition", "action"]:
# this is an element that can have located variables
self.Table = VariableTable(self, [], GetVariableTableColnames(True))
@@ -872,7 +872,7 @@
bodytype = self.Controler.GetEditedElementBodyType(self.TagName)
pouname, poutype = self.Controler.GetEditedElementType(self.TagName)
if classtype in ["Input", "Output", "InOut", "External", "Global"] or \
- poutype != "function" and bodytype in ["ST", "IL"]:
+ poutype != "function" and bodytype in ["ST", "IL"]:
functionblock_menu = wx.Menu(title='')
fbtypes = self.Controler.GetFunctionBlockTypes(self.TagName)
for functionblock_type in fbtypes:
--- a/doc/conf.py Sat Aug 19 16:30:15 2017 +0300
+++ b/doc/conf.py Sat Aug 19 16:45:37 2017 +0300
@@ -174,14 +174,14 @@
# -- Options for LaTeX output --------------------------------------------------
latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+ # The paper size ('letterpaper' or 'a4paper').
+ #'papersize': 'letterpaper',
+
+ # The font size ('10pt', '11pt' or '12pt').
+ #'pointsize': '10pt',
+
+ # Additional stuff for the LaTeX preamble.
+ #'preamble': '',
}
# Grouping the document tree into LaTeX files. List of tuples
--- a/runtime/NevowServer.py Sat Aug 19 16:30:15 2017 +0300
+++ b/runtime/NevowServer.py Sat Aug 19 16:45:37 2017 +0300
@@ -64,7 +64,7 @@
jsClass = u"WebInterface.PLC"
docFactory = loaders.stan(tags.div(render=tags.directive('liveElement'))[
tags.div(id='content')[
- tags.div(render=tags.directive('PLCElement')),
+ tags.div(render=tags.directive('PLCElement')),
]])
def __init__(self, *a, **kw):
--- a/svgui/pyjs/pyjs.py Sat Aug 19 16:30:15 2017 +0300
+++ b/svgui/pyjs/pyjs.py Sat Aug 19 16:45:37 2017 +0300
@@ -186,7 +186,7 @@
return """
pyjslib.import_module(sys.loadpath, '%(p)s', '%(n)s', %(d)d, false);
""" % ({'p': parentName, 'd': dynamic, 'n': importName}) + \
- mod_var_name_decl(importName)
+ mod_var_name_decl(importName)
class Translator:
@@ -806,7 +806,7 @@
# I attempted lazy initialization, but then you can't access static class members
# " if(!__"+base_class+".__was_initialized__)"+
# " __" + class_name + "_initialize();\n" +
- " var instance = new " + UU + class_name_ + "();\n" +
+ " var instance = new " + UU + class_name_ + "();\n" +
" if(instance.__init__) instance.__init__.apply(instance, arguments);\n" +
" return instance;"
)]))])
--- a/svgui/svgui.py Sat Aug 19 16:30:15 2017 +0300
+++ b/svgui/svgui.py Sat Aug 19 16:45:37 2017 +0300
@@ -122,9 +122,9 @@
def _runtime_%(location)s_stop():
website.UnLoadHMI()
-""" % {"location": location_str,
- "svgui_class": "SVGUI_HMI",
- "jsmodules": str(jsmodules)})
+ """ % {"location": location_str,
+ "svgui_class": "SVGUI_HMI",
+ "jsmodules": str(jsmodules)})
runtimefile.close()
res += (("runtime_%s.py" % location_str, file(runtimefile_path, "rb")),)
--- a/xmlclass/xsdschema.py Sat Aug 19 16:30:15 2017 +0300
+++ b/xmlclass/xsdschema.py Sat Aug 19 16:45:37 2017 +0300
@@ -1139,9 +1139,9 @@
XSD_NAMESPACE = {
-#-------------------------------------------------------------------------------
-# Syntax elements definition
-#-------------------------------------------------------------------------------
+ #-------------------------------------------------------------------------------
+ # Syntax elements definition
+ #-------------------------------------------------------------------------------
"all": {
"struct": """
@@ -1917,9 +1917,9 @@
"reduce": GenerateFacetReducing("whiteSpace", True)
},
-#-------------------------------------------------------------------------------
-# Syntax attributes definition
-#-------------------------------------------------------------------------------
+ #-------------------------------------------------------------------------------
+ # Syntax attributes definition
+ #-------------------------------------------------------------------------------
"abstract": {
"type": SYNTAXATTRIBUTE,
@@ -2194,14 +2194,14 @@
"xpath": {
"type": SYNTAXATTRIBUTE,
"extract": {
-# "default": NotSupportedYet("xpath")
+ # "default": NotSupportedYet("xpath")
"default": GetAttributeValue
}
},
-#-------------------------------------------------------------------------------
-# Simple types definition
-#-------------------------------------------------------------------------------
+ #-------------------------------------------------------------------------------
+ # Simple types definition
+ #-------------------------------------------------------------------------------
"string": {
"type": SIMPLETYPE,