Changeset 6420 for hwdetector/trunk/fuentes/hwdetector.install/hwdetector/modules/llxldap.py

Timestamp:

Dec 1, 2017, 11:38:50 AM (2 years ago)

Author:

mabarracus

Message:

Fix type checks with unicode vars

File:

• hwdetector/trunk/fuentes/hwdetector.install/hwdetector/modules/llxldap.py (modified) (3 diffs)

hwdetector/trunk/fuentes/hwdetector.install/hwdetector/modules/llxldap.py

@@ -86 +86 @@
 
     def parse_tree(self,*args,**kwargs):
-        if type(args[0]) != type(str()):
+        if not (isinstance(args[0],str) or isinstance(args[0],unicode)):
             return None
         output = {}
@@ -127 +127 @@
             out = args[1]
         for k in d.keys():
-            if type(d[k]) == type(dict()):
+            if isinstance(d[k],dict):
                 split = k.split('=')
                 if len(split) > 1:
@@ -267 +267 @@
                 netinfo=kwargs['NETINFO']
                 if netinfo:
-                    aliased_interfaces = [ k for k in netinfo if type(netinfo[k]) == type(dict()) and 'nalias' in netinfo[k] and netinfo[k]['nalias'] > 0 ]
+                    aliased_interfaces = [ k for k in netinfo if isinstance(netinfo[k],dict) and 'nalias' in netinfo[k] and netinfo[k]['nalias'] > 0 ]
                     for i in aliased_interfaces:
                         for n in range(netinfo[i]['nalias']):