(python): исправил ошибку в интерфейсе (доступ к несуществующей функции)

conf/libuniset.spec

@@ -7,7 +7,7 @@
 
 Name: libuniset
 Version: 1.6
-Release: alt14
+Release: alt15
 
 Summary: UniSet - library for building distributed industrial control systems
 
@@ -319,6 +319,9 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Mon Oct 28 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt15
+- (python): fixed bug in UInterface
+
 * Sat Oct 26 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt14
 - (python): fixed bug in UInterface
 

python/lib/UGlobal.py

@@ -6,7 +6,7 @@ import time
 import sys
 
 def is_id( str_id ):
-    if str_id.__class__.__name__ == "int":
+    if str_id.__class__.__name__ == "int" or str_id.__class__.__name__ == "long":
        return True
 
     if str_id.strip().isdigit():
@@ -19,7 +19,7 @@ def to_int(s):
     if s == None or s == "":
        return 0
 
-    if s.__class__.__name__ == "int":
+    if s.__class__.__name__ == "int" or s.__class__.__name__ == "long":
        return s
 
     if s.__class__.__name__ == "float":
@@ -238,7 +238,7 @@ def getArgInt(param,defval=0):
     for i in range(0, len(sys.argv)):
         if sys.argv[i] == param:
             if i+1 < len(sys.argv):
-                return to_int(strsys.argv[i+1])
+                return to_int(sys.argv[i+1])
             else:
                 break;
 

python/lib/UInterface.py

@@ -121,3 +121,12 @@ class UInterface():
            return None
 
         raise UException("(getNodeID): Unknown interface %s"%self.utype)
+
+    def getSensorID(self,s_name):
+        if self.itype == "uniset":
+           return self.i.getSensorID(s_name)
+
+        if self.itype == "modbus":
+           return None
+
+        raise UException("(getSensorID): Unknown interface %s"%self.utype)