# HG changeset patch # User Andrey Skvortsov # Date 1502877673 -10800 # Node ID d14ff9d7eb7672bced5a2e717e17f71918ee80c7 # Parent c28db6f7616be1dfd99853e663cd439852547228 clean-up: fix PEP8 E703 statement ends with a semicolon diff -r c28db6f7616b -r d14ff9d7eb76 Beremiz.py --- a/Beremiz.py Wed Aug 16 12:57:52 2017 +0300 +++ b/Beremiz.py Wed Aug 16 13:01:13 2017 +0300 @@ -57,7 +57,7 @@ else: for i in range(0, 30): wx.Yield() - time.sleep(0.01); + time.sleep(0.01) def Usage(self): print "Usage:" diff -r c28db6f7616b -r d14ff9d7eb76 POULibrary.py --- a/POULibrary.py Wed Aug 16 12:57:52 2017 +0300 +++ b/POULibrary.py Wed Aug 16 13:01:13 2017 +0300 @@ -34,7 +34,7 @@ self.LibraryControler.OpenXMLFile(self.GetLibraryPath()) self.LibraryControler.ClearConfNodeTypes() self.LibraryControler.AddConfNodeTypesList(TypeStack) - self.program = None; + self.program = None def GetSTCode(self): if not self.program: diff -r c28db6f7616b -r d14ff9d7eb76 ProjectController.py --- a/ProjectController.py Wed Aug 16 12:57:52 2017 +0300 +++ b/ProjectController.py Wed Aug 16 13:01:13 2017 +0300 @@ -1830,7 +1830,7 @@ self.AppFrame.CloseObsoleteDebugTabs() self.AppFrame.RefreshPouInstanceVariablesPanel() self.logger.write(_("Transfer completed successfully.\n")) - self.AppFrame.LogViewer.ResetLogCounters(); + self.AppFrame.LogViewer.ResetLogCounters() else: self.logger.write_error(_("Transfer failed\n")) self.HidePLCProgress() diff -r c28db6f7616b -r d14ff9d7eb76 controls/VariablePanel.py --- a/controls/VariablePanel.py Wed Aug 16 12:57:52 2017 +0300 +++ b/controls/VariablePanel.py Wed Aug 16 13:01:13 2017 +0300 @@ -157,7 +157,7 @@ var_type = self.Parent.GetTagName() bodytype = self.Parent.Controler.GetEditedElementBodyType(var_type) if bodytype in ["ST", "IL"]: - row_edit = True; + row_edit = True return row_edit def _updateColAttrs(self, grid): diff -r c28db6f7616b -r d14ff9d7eb76 editors/Viewer.py --- a/editors/Viewer.py Wed Aug 16 12:57:52 2017 +0300 +++ b/editors/Viewer.py Wed Aug 16 13:01:13 2017 +0300 @@ -2330,7 +2330,7 @@ elif not self.Debug and self.Mode == MODE_SELECTION and self.SelectedElement is not None: if self.DrawingWire: connector, errorHighlight = self.FindBlockConnectorWithError(pos, self.SelectedElement.GetConnectionDirection(), self.SelectedElement.EndConnected) - self.SelectedElement.ErrHighlight = errorHighlight; + self.SelectedElement.ErrHighlight = errorHighlight if not connector or self.SelectedElement.EndConnected is None: self.SelectedElement.ResetPoints() movex, movey = self.SelectedElement.OnMotion(event, dc, self.Scaling) diff -r c28db6f7616b -r d14ff9d7eb76 graphics/GraphicCommons.py --- a/graphics/GraphicCommons.py Wed Aug 16 12:57:52 2017 +0300 +++ b/graphics/GraphicCommons.py Wed Aug 16 13:01:13 2017 +0300 @@ -1381,7 +1381,7 @@ connector_free = (wire_nums <= 0) connector_max_used = ((wire_nums > 0) and self.OneConnected) if (self.Parent.CurrentLanguage in ["SFC", "LD"]) and (self.Type == "BOOL"): - connector_max_used = False; + connector_max_used = False # connector is available for new connection connect = connector_free or not connector_max_used @@ -1389,8 +1389,8 @@ # Tests if the point given is near from the end point of this connector def TestPoint(self, pt, direction=None, exclude=True): - inside = False; - check_point = (not exclude) and (direction is None or self.Direction == direction); + inside = False + check_point = (not exclude) and (direction is None or self.Direction == direction) if check_point: # Calculate a square around the end point of this connector @@ -1400,7 +1400,7 @@ width = ANCHOR_DISTANCE * 2 + abs(self.Direction[0]) * CONNECTOR_SIZE height = ANCHOR_DISTANCE * 2 + abs(self.Direction[1]) * CONNECTOR_SIZE rect = wx.Rect(x, y, width, height) - inside = rect.InsideXY(pt.x, pt.y); + inside = rect.InsideXY(pt.x, pt.y) return inside diff -r c28db6f7616b -r d14ff9d7eb76 svgui/pyjs/lib/pyjslib.py --- a/svgui/pyjs/lib/pyjslib.py Wed Aug 16 12:57:52 2017 +0300 +++ b/svgui/pyjs/lib/pyjslib.py Wed Aug 16 13:01:13 2017 +0300 @@ -201,7 +201,7 @@ self.app_modlist = app_modlist self.app_imported_fn = app_imported_fn self.path = path - self.idx = 0; + self.idx = 0 self.dynamic = dynamic self.parent_mod = parent_mod @@ -209,7 +209,7 @@ for i in range(len(self.app_modlist[self.idx])): app = self.app_modlist[self.idx][i] - import_module(self.path, self.parent_mod, app, self.dynamic, True); + import_module(self.path, self.parent_mod, app, self.dynamic, True) self.idx += 1 if self.idx >= len(self.app_modlist): @@ -888,10 +888,10 @@ return self.__iter__() def itervalues(self): - return self.values().__iter__(); + return self.values().__iter__() def iteritems(self): - return self.items().__iter__(); + return self.items().__iter__() def setdefault(self, key, default_value): if not self.has_key(key): diff -r c28db6f7616b -r d14ff9d7eb76 svgui/pyjs/pyjs.py --- a/svgui/pyjs/pyjs.py Wed Aug 16 12:57:52 2017 +0300 +++ b/svgui/pyjs/pyjs.py Wed Aug 16 13:01:13 2017 +0300 @@ -874,8 +874,8 @@ if staticmethod: staticfunc = ast.Function([], class_name_+"."+node.name, node.argnames, node.defaults, node.flags, node.doc, node.code, node.lineno) self._function(staticfunc, True) - print >>self.output, " " + UU+class_name_ + ".prototype.__class__." + node.name + " = " + class_name_+"."+node.name+";"; - print >>self.output, " " + UU+class_name_ + ".prototype.__class__." + node.name + ".static_method = true;"; + print >>self.output, " " + UU+class_name_ + ".prototype.__class__." + node.name + " = " + class_name_+"."+node.name+";" + print >>self.output, " " + UU+class_name_ + ".prototype.__class__." + node.name + ".static_method = true;" return else: if len(arg_names) == 0: diff -r c28db6f7616b -r d14ff9d7eb76 util/Zeroconf.py --- a/util/Zeroconf.py Wed Aug 16 12:57:52 2017 +0300 +++ b/util/Zeroconf.py Wed Aug 16 13:01:13 2017 +0300 @@ -103,9 +103,9 @@ # Some DNS constants _MDNS_ADDR = '224.0.0.251' -_MDNS_PORT = 5353; -_DNS_PORT = 53; -_DNS_TTL = 60 * 60; # one hour default TTL +_MDNS_PORT = 5353 +_DNS_PORT = 53 +_DNS_TTL = 60 * 60 # one hour default TTL _MAX_MSG_TYPICAL = 1460 # unused _MAX_MSG_ABSOLUTE = 8972