# HG changeset patch
# User Andrey Skvortsov <andrej.skvortzov@gmail.com>
# Date 1538146768 -10800
# Node ID 8e5a9830867e71cd41a3712a9204494cbeb0dfd2
# Parent  7c67286cddbeec57fdfcdedd550f2d92e9049f66
cleanup etherlab: pep8, E228 missing whitespace around modulo operator

diff -r 7c67286cddbe -r 8e5a9830867e etherlab/CommonEtherCATFunction.py
--- a/etherlab/CommonEtherCATFunction.py	Fri Sep 28 17:52:30 2018 +0300
+++ b/etherlab/CommonEtherCATFunction.py	Fri Sep 28 17:59:28 2018 +0300
@@ -216,7 +216,7 @@
         Command example : "ethercat states -p 0 PREOP" (target slave position and target state are given.)
         @param command : target slave state
         """
-        error, return_val = self.Controler.RemoteExec(SLAVE_STATE%(self.Controler.GetSlavePos(), command), return_val = None)
+        error, return_val = self.Controler.RemoteExec(SLAVE_STATE % (self.Controler.GetSlavePos(), command), return_val = None)
 
     def GetSlaveStateFromSlave(self):
         """
@@ -237,7 +237,7 @@
         Command example : "ethercat sdos -p 0"
         @return return_val : execution results of "ethercat sdos" command (need to be parsed later)
         """
-        error, return_val = self.Controler.RemoteExec(SLAVE_SDO%(self.Controler.GetSlavePos()), return_val = None)
+        error, return_val = self.Controler.RemoteExec(SLAVE_SDO % (self.Controler.GetSlavePos()), return_val = None)
         return return_val
 
     def SDODownload(self, data_type, idx, sub_idx, value):
@@ -249,7 +249,7 @@
         @param sub_idx : subindex of the SDO entry
         @param value : value of SDO entry
         """
-        error, return_val = self.Controler.RemoteExec(SDO_DOWNLOAD%(data_type, self.Controler.GetSlavePos(), idx, sub_idx, value), return_val = None)
+        error, return_val = self.Controler.RemoteExec(SDO_DOWNLOAD % (data_type, self.Controler.GetSlavePos(), idx, sub_idx, value), return_val = None)
 
     def BackupSDODataSet(self):
         """
@@ -488,8 +488,8 @@
             mb = device.getMailbox()
             if mb is not None:
                 for mailbox_protocol in mailbox_protocols:
-                    if getattr(mb,"get%s"%mailbox_protocol)() is not None:
-                        smartview_infos["supported_mailbox"] += "%s,  "%mailbox_protocol
+                    if getattr(mb,"get%s" % mailbox_protocol)() is not None:
+                        smartview_infos["supported_mailbox"] += "%s,  " % mailbox_protocol
             smartview_infos["supported_mailbox"] = smartview_infos["supported_mailbox"].strip(",  ")
 
             # get standard configuration of mailbox; <Device>-<Sm>
@@ -554,7 +554,7 @@
         Command example : "ethercat sii_read -p 0"
         @return return_val : result of "ethercat sii_read" (binary data)
         """
-        error, return_val = self.Controler.RemoteExec(SII_READ%(self.Controler.GetSlavePos()), return_val = None)
+        error, return_val = self.Controler.RemoteExec(SII_READ % (self.Controler.GetSlavePos()), return_val = None)
         self.SiiData = return_val
         return return_val
 
@@ -565,7 +565,7 @@
         @param binary : EEPROM contents in binary data format
         @return return_val : result of "ethercat sii_write" (If it succeeds, the return value is NULL.)
         """
-        error, return_val = self.Controler.RemoteExec(SII_WRITE%(self.Controler.GetSlavePos()), return_val = None, sii_data = binary)
+        error, return_val = self.Controler.RemoteExec(SII_WRITE % (self.Controler.GetSlavePos()), return_val = None, sii_data = binary)
         return return_val
 
     def LoadData(self):
@@ -783,7 +783,7 @@
             mb = device.getMailbox()
             if mb is not None :
                 for bit,mbprot in enumerate(mailbox_protocols):
-                    if getattr(mb,"get%s"%mbprot)() is not None:
+                    if getattr(mb,"get%s" % mbprot)() is not None:
                         data += 1<<bit
             data = "{:0>4x}".format(data)
             eeprom.append(data[2:4])
@@ -1119,10 +1119,10 @@
         eeprom.append("00")
         #  category length (word); 1 word is 4 bytes. "+2" is the length of string's total number
         length = len(vendor_specific_data + dc_related_elements + input_elements + output_elements) + 2
-        if length%4 == 0:
+        if length % 4 == 0:
             pass
         else:
-            length +=length%4
+            length +=length % 4
             padflag = True
         eeprom.append("{:0>4x}".format(length/4)[2:4])
         eeprom.append("{:0>4x}".format(length/4)[0:2])
@@ -1180,7 +1180,7 @@
             if coe is not None:
                 for bit,flag in enumerate(["SdoInfo", "PdoAssign", "PdoConfig",
                                            "PdoUpload", "CompleteAccess"]):
-                    if getattr(coe,"get%s"%flag)() is not None:
+                    if getattr(coe,"get%s" % flag)() is not None:
                         coe_details += 1<<bit
         eeprom.append("{:0>2x}".format(coe_details))
 
@@ -1276,7 +1276,7 @@
             eeprom.append("28")
             eeprom.append("00")
             #  category length
-            if count%2 == 1:
+            if count % 2 == 1:
                 padflag = True
                 eeprom.append("{:0>4x}".format((count+1)/2)[2:4])
                 eeprom.append("{:0>4x}".format((count+1)/2)[0:2])
@@ -1350,7 +1350,7 @@
         en_mandatory = False
         en_virtual = False
 
-        for element in eval("device.get%s()"%pdotype):
+        for element in eval("device.get%s()" % pdotype):
             #  PDO Index
             data += "{:0>4x}".format(ExtractHexDecValue(element.getIndex().getcontent()))[2:4]
             data += "{:0>4x}".format(ExtractHexDecValue(element.getIndex().getcontent()))[0:2]
@@ -1530,7 +1530,7 @@
         @param length : register length
         @return return_val : register data
         """
-        error, return_val = self.Controler.RemoteExec(REG_READ%(self.Controler.GetSlavePos(), offset, length), return_val = None)
+        error, return_val = self.Controler.RemoteExec(REG_READ % (self.Controler.GetSlavePos(), offset, length), return_val = None)
         return return_val
 
     def RegWrite(self, address, data):
@@ -1541,7 +1541,7 @@
         @param data : data to write
         @return return_val : the execution result of "ethercat reg_write" (for error check)
         """
-        error, return_val = self.Controler.RemoteExec(REG_WRITE%(self.Controler.GetSlavePos(), address, data), return_val = None)
+        error, return_val = self.Controler.RemoteExec(REG_WRITE % (self.Controler.GetSlavePos(), address, data), return_val = None)
         return return_val
 
     def Rescan(self):
@@ -1549,7 +1549,7 @@
         Synchronize EEPROM data in master controller with the data in slave device after EEPROM write.
         Command example : "ethercat rescan -p 0"
         """
-        error, return_val = self.Controler.RemoteExec(RESCAN%(self.Controler.GetSlavePos()), return_val = None)
+        error, return_val = self.Controler.RemoteExec(RESCAN % (self.Controler.GetSlavePos()), return_val = None)
 
     # -------------------------------------------------------------------------------
     #                        Common Use Methods
@@ -1563,7 +1563,7 @@
         if self.Controler.GetCTRoot()._connector is not None:
             # Check connection between the master and the slave.
             # Command example : "ethercat xml -p 0"
-            error, return_val = self.Controler.RemoteExec(SLAVE_XML%(self.Controler.GetSlavePos()), return_val = None)
+            error, return_val = self.Controler.RemoteExec(SLAVE_XML % (self.Controler.GetSlavePos()), return_val = None)
             number_of_lines = return_val.split("\n")
             if len(number_of_lines) <= 2 :  # No slave connected to the master controller
                 if not cyclic_flag :
diff -r 7c67286cddbe -r 8e5a9830867e etherlab/ConfigEditor.py
--- a/etherlab/ConfigEditor.py	Fri Sep 28 17:52:30 2018 +0300
+++ b/etherlab/ConfigEditor.py	Fri Sep 28 17:59:28 2018 +0300
@@ -401,10 +401,10 @@
         try:
             values = eval(data)
         except Exception:
-            message = _("Invalid value \"%s\" for process variable")%data
+            message = _("Invalid value \"%s\" for process variable") % data
             values = None
         if not isinstance(values, TupleType):
-            message = _("Invalid value \"%s\" for process variable")%data
+            message = _("Invalid value \"%s\" for process variable") % data
             values = None
         if values is not None and col != wx.NOT_FOUND and row != wx.NOT_FOUND and 2 <= col <= 3:
             location = None
@@ -435,7 +435,7 @@
                     else:
                         message = _("'Read from' and 'Write to' variables types are not compatible")
                 else:
-                    message = _("Invalid value \"%s\" for process variable")%data
+                    message = _("Invalid value \"%s\" for process variable") % data
 
         if message is not None:
             wx.CallAfter(self.ShowMessage, message)
@@ -461,10 +461,10 @@
         try:
             values = eval(data)
         except Exception:
-            message = _("Invalid value \"%s\" for startup command")%data
+            message = _("Invalid value \"%s\" for startup command") % data
             values = None
         if not isinstance(values, TupleType):
-            message = _("Invalid value \"%s\" for startup command")%data
+            message = _("Invalid value \"%s\" for startup command") % data
             values = None
         if values is not None:
             location = None
@@ -485,7 +485,7 @@
                     else:
                         message = _("Entry can't be write through SDO")
                 else:
-                    message = _("Invalid value \"%s\" for startup command")%data
+                    message = _("Invalid value \"%s\" for startup command") % data
 
         if message is not None:
             wx.CallAfter(self.ShowMessage, message)
diff -r 7c67286cddbe -r 8e5a9830867e etherlab/EtherCATManagementEditor.py
--- a/etherlab/EtherCATManagementEditor.py	Fri Sep 28 17:52:30 2018 +0300
+++ b/etherlab/EtherCATManagementEditor.py	Fri Sep 28 17:59:28 2018 +0300
@@ -1401,7 +1401,7 @@
                 self.SetColLabelValue(16, "Text View")
                 self.SetColSize(16, (self.GetSize().x-120)*4/20)
             else:
-                self.SetColLabelValue(col, '%s'%col)
+                self.SetColLabelValue(col, '%s' % col)
                 self.SetColSize(col, (self.GetSize().x-120)/20)
 
         # set data into table
@@ -1672,7 +1672,7 @@
         for address in range(0x1000):
             # arrange 2 Bytes of register data
             reg_word = reg_data[address].split('x')[1] + reg_word
-            if (address%2) == 1:
+            if (address % 2) == 1:
                 # append address
                 hex_address = "{:0>4x}".format(address-1)
                 row_data.append(hex_address)
diff -r 7c67286cddbe -r 8e5a9830867e etherlab/EthercatCIA402Slave.py
--- a/etherlab/EthercatCIA402Slave.py	Fri Sep 28 17:52:30 2018 +0300
+++ b/etherlab/EthercatCIA402Slave.py	Fri Sep 28 17:59:28 2018 +0300
@@ -324,9 +324,9 @@
 
         # Write generated content to CIA402 node file
         Gen_CIA402Nodefile_path = os.path.join(buildpath,
-                                "cia402node_%s.c"%location_str)
+                                "cia402node_%s.c" % location_str)
         cia402nodefile = open(Gen_CIA402Nodefile_path, 'w')
         cia402nodefile.write(plc_cia402node_code % locals())
         cia402nodefile.close()
 
-        return [(Gen_CIA402Nodefile_path, '"-I%s"'%os.path.abspath(self.GetCTRoot().GetIECLibPath()))],"",True
+        return [(Gen_CIA402Nodefile_path, '"-I%s"' % os.path.abspath(self.GetCTRoot().GetIECLibPath()))],"",True
diff -r 7c67286cddbe -r 8e5a9830867e etherlab/EthercatMaster.py
--- a/etherlab/EthercatMaster.py	Fri Sep 28 17:52:30 2018 +0300
+++ b/etherlab/EthercatMaster.py	Fri Sep 28 17:59:28 2018 +0300
@@ -661,7 +661,7 @@
                                          "size": var_size,
                                          "IEC_type": entry["Type"],
                                          "var_name": "%s_%4.4x_%2.2x" % ("_".join(device_name.split()), index, subindex),
-                                         "location": "%s%s%s"%(var_dir, var_size, ".".join(map(str, current_location +
+                                         "location": "%s%s%s" % (var_dir, var_size, ".".join(map(str, current_location +
                                                                                                     (index, subindex)))),
                                          "description": "",
                                          "children": []})
@@ -703,7 +703,7 @@
         # define a unique name for the generated C file
         location_str = "_".join(map(lambda x:str(x), current_location))
 
-        Gen_Ethercatfile_path = os.path.join(buildpath, "ethercat_%s.c"%location_str)
+        Gen_Ethercatfile_path = os.path.join(buildpath, "ethercat_%s.c" % location_str)
 
         self.FileGenerator = _EthercatCFileGenerator(self)
 
@@ -738,7 +738,7 @@
 
         LocationCFilesAndCFLAGS.insert(0,
             (current_location,
-             [(Gen_Ethercatfile_path, '"-I%s"'%os.path.abspath(self.GetCTRoot().GetIECLibPath()))],
+             [(Gen_Ethercatfile_path, '"-I%s"' % os.path.abspath(self.GetCTRoot().GetIECLibPath()))],
              True))
         LDFLAGS.append("-lethercat_rtdm -lrtdm")
 
diff -r 7c67286cddbe -r 8e5a9830867e etherlab/runtime_etherlab.py
--- a/etherlab/runtime_etherlab.py	Fri Sep 28 17:52:30 2018 +0300
+++ b/etherlab/runtime_etherlab.py	Fri Sep 28 17:59:28 2018 +0300
@@ -46,7 +46,7 @@
     if res != 0 :
         PLCObject.LogMessage(
             LogLevelsDict["WARNING"],
-            "%s : %s"%(command,output))
+            "%s : %s" % (command,output))
 
 def EthercatSDOUpload(pos, index, subindex, var_type):
     global SDOThread