snake_case

git-svn-id: https://redmine.imt-atlantique.fr/svn/xaal/code/Python/branches/0.7@2373 b32b6428-25c9-4566-ad07-03861ab6144f

apps/tools/xaal/tools/isalive.py

@@ -35,15 +35,15 @@ class Scanner:
         self.eng.add_device(self.dev)
         self.eng.add_rx_handler(self.parse_answer)
 
-    def query(self,devtype):
-        if not tools.is_valid_devtype(devtype):
-            logger.warning("devtype not valid [%s]" % devtype)
+    def query(self,dev_type):
+        if not tools.is_valid_dev_type(dev_type):
+            logger.warning("dev_type not valid [%s]" % dev_type)
             return
-        self.devtype = devtype
+        self.dev_type = dev_type
         self.seen = []
 
-        logger.info("[%s] searching [%s]" % (self.dev.address,self.devtype))
-        self.eng.send_isAlive(self.dev,self.devtype)
+        logger.info("[%s] searching [%s]" % (self.dev.address,self.dev_type))
+        self.eng.send_isAlive(self.dev,self.dev_type)
 
         print("="*70)
         self.loop()
@@ -63,17 +63,17 @@ class Scanner:
             if msg.source == self.dev.address:
                 return
             #it is really for us ?
-            if self.devtype != 'any.any':
-                (target_devtype,target_devsubtype) = self.devtype.split('.')
-                (msg_devtype,msg_devsubtype) = msg.devtype.split('.')
-                if msg_devtype != target_devtype:
+            if self.dev_type != 'any.any':
+                (target_dev_type,target_devsubtype) = self.dev_type.split('.')
+                (msg_dev_type,msg_devsubtype) = msg.dev_type.split('.')
+                if msg_dev_type != target_dev_type:
                     return
                 if target_devsubtype != 'any' and target_devsubtype != msg_devsubtype:
                     return
             if msg.source in self.seen:
                 return
             # everything is Ok :)
-            print("%s : %s" % (msg.source,msg.devtype))
+            print("%s : %s" % (msg.source,msg.dev_type))
             self.seen.append(msg.source)
 
 
@@ -83,16 +83,16 @@ def run():
     eng = Engine()
     scan = Scanner(eng)
     eng.start()
-    devtype = 'any.any'
+    dev_type = 'any.any'
     if len(sys.argv) == 2:
-        devtype = sys.argv[1]
-    scan.query(devtype)
+        dev_type = sys.argv[1]
+    scan.query(dev_type)
 
 
-def search(engine,devtype='any.any'):
+def search(engine,dev_type='any.any'):
     """ send request and return list of xaal-addr"""
     scan = Scanner(engine)
-    scan.query(devtype)
+    scan.query(dev_type)
     return scan.seen
 
 def main():

apps/tools/xaal/tools/tail.py

@@ -61,7 +61,7 @@ def display(msg):
         tmp = 50
     BODY_FORMAT = '%-50.'+str(tmp)+'s'
     FORMAT = '%-8.08s=> %-15.15s %-36.36s (%-20.20s) %-16.16s '+BODY_FORMAT
-    res = FORMAT % (type_to_string(msg.msgtype),msg.action,msg.source,msg.devtype,targets,msg.body)
+    res = FORMAT % (type_to_string(msg.msg_type),msg.action,msg.source,msg.dev_type,targets,msg.body)
     print(res)
 
 def usage():