(python): рефкторинг

conf/libuniset2.spec

@@ -16,7 +16,7 @@
 
 Name: libuniset2
 Version: 2.6
-Release: alt9
+Release: alt10
 Summary: UniSet - library for building distributed industrial control systems
 
 License: LGPL
@@ -505,11 +505,14 @@ mv -f %buildroot%python_sitelibdir_noarch/* %buildroot%python_sitelibdir/%oname
 %exclude %_pkgconfigdir/libUniSet2.pc
         
 # history of current unpublished changes
-# add tests for REST API (with RPC)
-# python: refactoring UInterface (add UInterfaceModbus and UInterfaceUniSet)
-# refactoring TCPCheck (use future)
 
 %changelog
+* Mon Jan 09 2017 Pavel Vainerman <pv@altlinux.ru> 2.6-alt10
+- add tests for REST API (with RPC)
+- python: refactoring UInterface (add UInterfaceModbus and UInterfaceUniSet)
+- refactoring TCPCheck (use future)
+- minor refactoring and fixes
+
 * Fri Dec 16 2016 Pavel Vainerman <pv@altlinux.ru> 2.6-alt9
 - UObject: added attempts to activate the object
 

python/lib/UGlobal.py

@@ -5,248 +5,256 @@ from pyUConnector import *
 import time
 import sys
 
-def is_id( str_id ):
-    if isinstance(str_id,int) or isinstance(str_id,long):
-       return True
+
+def is_id(str_id):
+    if isinstance(str_id, int) or isinstance(str_id, long):
+        return True
 
     if str_id.strip().isdigit():
-       return True
+        return True
 
     return False
 
-def to_int(s):
 
+def to_int(s):
     if s == None or s == "":
-       return 0
+        return 0
 
-    if isinstance(s,int) or isinstance(s,long):
-       return s
+    if isinstance(s, int) or isinstance(s, long):
+        return s
 
-    if isinstance(s,float):
-       return int(s)
+    if isinstance(s, float):
+        return int(s)
 
-    if len(s)>2 and s[0] == '0' and s[1] == 'x':
-       return int(s,16)
+    if len(s) > 2 and s[0] == '0' and s[1] == 'x':
+        return int(s, 16)
 
     if s.upper() == "TRUE":
-       return 1
+        return 1
 
     if s.upper() == "FALSE":
-       return 0
+        return 0
 
     return int(s.strip())
-    
-def to_str(s_val):
 
+
+def to_str(s_val):
     if s_val == None:
-       return ""
+        return ""
 
     return str(s_val)
 
-def bool2str( state ):
+
+def bool2str(state):
     if state:
-       return "1"
+        return "1"
     return "0"
 
+
 def get_sinfo(raw, sep='@'):
     raw = to_str(raw)
     v = raw.strip().split(sep)
     if len(v) > 1:
-       return [v[0],v[1]]
-    return [v[0],""]
+        return [v[0], v[1]]
+    return [v[0], ""]
+
 
 # Функция требует инициализированного UConnector
 # (т.е. загруженного configure.xml)
 def to_sid(str_id, ui):
     if str_id == None or str_id == "":
-       return [DefaultID,DefaultID,""]
-    
+        return [DefaultID, DefaultID, ""]
+
     if is_id(str_id):
-       return [int(str_id),DefaultID,ui.getShortName(int(str_id))]
-    
+        return [int(str_id), DefaultID, ui.getShortName(int(str_id))]
+
     s = get_sinfo(str_id)
     s_id = s[0]
     s_node = s[1]
-   
+
     if s_id == "":
-       return [DefaultID,DefaultID,"?@?"]
-    
+        return [DefaultID, DefaultID, "?@?"]
+
     s_name = ""
     if is_id(s_id):
-       s_id = int(s_id)
-       s_name = ui.getShortName(s_id)
+        s_id = int(s_id)
+        s_name = ui.getShortName(s_id)
     else:
-       s_name = s_id
-       s_id = ui.getSensorID(s_id)
-    
+        s_name = s_id
+        s_id = ui.getSensorID(s_id)
+
     if s_node == "":
-       return [s_id,DefaultID,s_name]
-    
+        return [s_id, DefaultID, s_name]
+
     n_name = ""
     if is_id(s_node):
-       s_node = int(s_node)
-       n_name = ui.getShortName(s_node)
+        s_node = int(s_node)
+        n_name = ui.getShortName(s_node)
     else:
-       n_name = s_node
-       s_node = ui.getNodeID(s_node)
-    
-    return [s_id,s_node,str(s_name+"@"+n_name)]
+        n_name = s_node
+        s_node = ui.getNodeID(s_node)
+
+    return [s_id, s_node, str(s_name + "@" + n_name)]
+
 
 # Получение списка пар [id@node,int(val)] из строки "id1@node1=val1,id2=val2,.."
-def get_int_list(raw_str,sep='='):
-    
+def get_int_list(raw_str, sep='='):
     if raw_str == None or raw_str == "":
-       return []
-    
+        return []
+
     slist = []
     l = raw_str.split(",")
     for s in l:
         v = s.split(sep)
         if len(v) > 1:
-           slist.append([v[0],to_int(v[1])])
+            slist.append([v[0], to_int(v[1])])
         else:
-           print "(get_list:WARNING): (v=x) undefined value for " + str(s)
-           slist.append([v[0],0])
+            print "(get_list:WARNING): (v=x) undefined value for " + str(s)
+            slist.append([v[0], 0])
     return slist
 
-def list_to_str(lst,sep='='):
+
+def list_to_str(lst, sep='='):
     res = ""
     for v in lst:
         if res != "":
-           res += ",%s=%s"%(v[0],v[1])
+            res += ",%s=%s" % (v[0], v[1])
         else:
-           res += "%s=%s"%(v[0],v[1])
-    
+            res += "%s=%s" % (v[0], v[1])
+
     return res
 
+
 # Получение списка пар [sX,kX] из строки "s1=k1,s2=k2,.."
-def get_str_list(raw_str,sep='='):
-    
+def get_str_list(raw_str, sep='='):
     if raw_str == None or raw_str == "":
-       return []
-    
+        return []
+
     slist = []
     l = raw_str.split(",")
     for s in l:
         v = s.split("=")
         if len(v) > 1:
-           slist.append([v[0],v[1]])
+            slist.append([v[0], v[1]])
         else:
-           print "(get_str_list:WARNING): (v=x) undefined value for " + str(s)
-           slist.append([v[0],""])
+            print "(get_str_list:WARNING): (v=x) undefined value for " + str(s)
+            slist.append([v[0], ""])
     return slist
 
+
 # Получение списка пар [key,val] из строки "key1:val1,key2:val2,.."
 def get_replace_list(raw_str):
-    
     if raw_str == None or raw_str == "":
-       return []
+        return []
     slist = []
     l = raw_str.split(",")
     for s in l:
         v = s.split(":")
         if len(v) > 1:
-           key = to_str(v[0]).strip().strip("\n")
-           val = to_str(v[1]).strip().strip("\n")
-           slist.append([key,val])
+            key = to_str(v[0]).strip().strip("\n")
+            val = to_str(v[1]).strip().strip("\n")
+            slist.append([key, val])
         else:
-           print "(get_replace_list:WARNING): (v:x) undefined value for " + str(s)
-           key = to_str(v[0]).strip().strip("\n")
-           slist.append([key,0])
-    
+            print "(get_replace_list:WARNING): (v:x) undefined value for " + str(s)
+            key = to_str(v[0]).strip().strip("\n")
+            slist.append([key, 0])
+
     return slist
 
-# Парсинг строки вида hostname:port
-def get_mbslave_param( raw_str, sep=':' ):
 
+# Парсинг строки вида hostname:port
+def get_mbslave_param(raw_str, sep=':'):
     if to_str(raw_str) == "":
-       return [None,None]
+        return [None, None]
 
     l = raw_str.split(sep)
     if len(l) > 2:
-       print "(get_mbslave_param:WARNING): BAD FORMAT! string='%s'. Must be 'hostname:port'"%(raw_str)
-       return [None,None]
+        print "(get_mbslave_param:WARNING): BAD FORMAT! string='%s'. Must be 'hostname:port'" % (raw_str)
+        return [None, None]
 
     if len(l) == 2:
-       return [ l[0], to_int(l[1]) ]
+        return [l[0], to_int(l[1])]
 
-    #default modbus port = 502
-    return [ l[1], 502 ]
+    # default modbus port = 502
+    return [l[1], 502]
 
-# Парсинг строки вида "mbreg@mbaddr:mbfunc:nbit:vtype"
-def get_mbquery_param( raw_str, def_mbfunc="0x04", ret_str=False ):
 
+# Парсинг строки вида "mbreg@mbaddr:mbfunc:nbit:vtype"
+def get_mbquery_param(raw_str, def_mbfunc="0x04", ret_str=False):
     raw_str = to_str(raw_str)
 
     l = raw_str.split(':')
 
     vtype = "signed"
     if len(l) > 3:
-       vtype = l[3]
+        vtype = l[3]
 
     nbit = -1
     if len(l) > 2:
-       nbit = l[2]
+        nbit = l[2]
 
     mbfunc = def_mbfunc
     if len(l) > 1:
-       mbfunc = l[1]
+        mbfunc = l[1]
 
     if mbfunc.startswith("0x"):
-       mbfunc = str(int(mbfunc,16))
+        mbfunc = str(int(mbfunc, 16))
     else:
-       mbfunc = str(int(mbfunc,10))
+        mbfunc = str(int(mbfunc, 10))
 
     mbreg = None
     mbaddr = "0x01"
     if len(l) > 0:
-       p = l[0].split('@')
-       mbreg = p[0]
-       if len(p) > 1:
-          mbaddr = p[1]
+        p = l[0].split('@')
+        mbreg = p[0]
+        if len(p) > 1:
+            mbaddr = p[1]
 
     if len(mbaddr) == 0 or len(mbreg) == 0 or len(mbfunc) == 0:
-       if ret_str == True:
-          return ["","","","",""]
-          
-       #print "(get_mbquery_param:WARNING): BAD STRING FORMAT! strig='%s'. Must be 'mbreg@mbaddr:mbfunc:nbit:vtype'"%(raw_str)
-       return [None,None,None,None,None]
+        if ret_str == True:
+            return ["", "", "", "", ""]
+
+        # print "(get_mbquery_param:WARNING): BAD STRING FORMAT! strig='%s'. Must be 'mbreg@mbaddr:mbfunc:nbit:vtype'"%(raw_str)
+        return [None, None, None, None, None]
 
     if ret_str == False:
-       return [ to_int(mbaddr), to_int(mbreg), to_int(mbfunc), to_int(nbit), vtype ]
+        return [to_int(mbaddr), to_int(mbreg), to_int(mbfunc), to_int(nbit), vtype]
 
-    return [ mbaddr, mbreg, mbfunc, nbit, vtype ]
+    return [mbaddr, mbreg, mbfunc, nbit, vtype]
 
-def fcalibrate( raw, rawMin, rawMax, calMin, calMax ):
 
+def fcalibrate(raw, rawMin, rawMax, calMin, calMax):
     if rawMax == rawMin:
-       return 0; # деление на 0!!!
+        return 0;  # деление на 0!!!
+
+    return 1.0 * (raw - rawMin) * (calMax - calMin) / (rawMax - rawMin) + calMin;
 
-    return 1.0 * (raw - rawMin) * (calMax - calMin) / ( rawMax - rawMin ) + calMin;
 
-def getArgParam(param,defval=""):
+def getArgParam(param, defval=""):
     for i in range(0, len(sys.argv)):
         if sys.argv[i] == param:
-            if i+1 < len(sys.argv):
-                return sys.argv[i+1]
+            if i + 1 < len(sys.argv):
+                return sys.argv[i + 1]
             else:
-                break;
-            
+                break
+
     return defval
-    
-def getArgInt(param,defval=0):
+
+
+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(sys.argv[i+1])
+            if i + 1 < len(sys.argv):
+                return to_int(sys.argv[i + 1])
             else:
-                break;
-        
+                break
+
     return defval
-    
-def checkArgParam(param,defval=""):
+
+
+def checkArgParam(param, defval=""):
     for i in range(0, len(sys.argv)):
         if sys.argv[i] == param:
             return True
-        
+
     return defval

python/lib/UInterface.py

@@ -4,11 +4,8 @@
 import sys
 
 from pyUniSet import *
-from pyUConnector import *
-from UGlobal import *
 from pyUExceptions import *
 
-
 class UInterface():
     def __init__(self):
         self.itype = ""

python/lib/UInterfaceModbus.py

@@ -3,18 +3,18 @@
 
 import sys
 
-from pyUniSet import *
-from pyUModbus import *
+from UInterface import *
 from UGlobal import *
-from pyUExceptions import *
+from pyUModbus import *
 
 
-class UInterfaceModbus():
-    def __init__(self):
+class UInterfaceModbus(UInterface):
+    def __init__(self, ip, port):
         UInterface.__init__(self)
 
         self.itype = "modbus"
         self.i = UModbus()
+        self.i.prepare(ip,port)
 
     # return [id,node,name]
     def getIDinfo(self, s_id):

python/lib/UInterfaceUniSet.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 from UInterface import *
+from UGlobal import *
 from pyUConnector import *
 
-
 class UInterfaceUniSet(UInterface):
     def __init__(self, xmlfile, params):
         UInterface.__init__(self)

python/lib/__init__.py

@@ -4,6 +4,8 @@
 from UGlobal import *
 from UniXML import *
 from UInterface import *
+from UInterfaceUniSet import *
+from UInterfaceModbus import *
 
 from pyUniSet import *
 from pyUModbus import *

python/lib/pyUniSet/UModbus.i

@@ -12,4 +12,4 @@
 
 /* Для генерации классов и констант в Питоне */
 %include "UModbus.h"
-%include "UExceptions.h"
+// %include "UExceptions.h"

python/lib/pyUniSet/UModbus_wrap.cxx

@@ -3009,12 +3009,9 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) {
 
 #define SWIGTYPE_p_UException swig_types[0]
 #define SWIGTYPE_p_UModbus swig_types[1]
-#define SWIGTYPE_p_USysError swig_types[2]
-#define SWIGTYPE_p_UTimeOut swig_types[3]
-#define SWIGTYPE_p_UValidateError swig_types[4]
-#define SWIGTYPE_p_char swig_types[5]
-static swig_type_info *swig_types[7];
-static swig_module_info swig_module = {swig_types, 6, 0, 0, 0, 0};
+#define SWIGTYPE_p_char swig_types[2]
+static swig_type_info *swig_types[4];
+static swig_module_info swig_module = {swig_types, 3, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -3467,9 +3464,6 @@ SWIGINTERNINLINE PyObject*
 
   #define SWIG_From_long   PyLong_FromLong 
 
-
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -5178,533 +5172,6 @@ SWIGINTERN PyObject *UModbus_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObje
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_UException__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  UException *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_UException")) SWIG_fail;
-  result = (UException *)new UException();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UException, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_UException__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::string *arg1 = 0 ;
-  int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  UException *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:new_UException",&obj0)) SWIG_fail;
-  {
-    std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_UException" "', argument " "1"" of type '" "std::string const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_UException" "', argument " "1"" of type '" "std::string const &""'"); 
-    }
-    arg1 = ptr;
-  }
-  result = (UException *)new UException((std::string const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UException, SWIG_POINTER_NEW |  0 );
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return resultobj;
-fail:
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_UException__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  char *arg1 = (char *) 0 ;
-  int res1 ;
-  char *buf1 = 0 ;
-  int alloc1 = 0 ;
-  PyObject * obj0 = 0 ;
-  UException *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:new_UException",&obj0)) SWIG_fail;
-  res1 = SWIG_AsCharPtrAndSize(obj0, &buf1, NULL, &alloc1);
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_UException" "', argument " "1"" of type '" "char const *""'");
-  }
-  arg1 = reinterpret_cast< char * >(buf1);
-  result = (UException *)new UException((char const *)arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UException, SWIG_POINTER_NEW |  0 );
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-  return resultobj;
-fail:
-  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_UException(PyObject *self, PyObject *args) {
-  Py_ssize_t argc;
-  PyObject *argv[2] = {
-    0
-  };
-  Py_ssize_t ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 0) {
-    return _wrap_new_UException__SWIG_0(self, args);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_new_UException__SWIG_1(self, args);
-    }
-  }
-  if (argc == 1) {
-    int _v;
-    int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0);
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_new_UException__SWIG_2(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_UException'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UException::UException()\n"
-    "    UException::UException(std::string const &)\n"
-    "    UException::UException(char const *)\n");
-  return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_UException(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  UException *arg1 = (UException *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_UException",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UException, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UException" "', argument " "1"" of type '" "UException *""'"); 
-  }
-  arg1 = reinterpret_cast< UException * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_UException_getError(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  UException *arg1 = (UException *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  std::string result;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:UException_getError",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UException, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UException_getError" "', argument " "1"" of type '" "UException *""'"); 
-  }
-  arg1 = reinterpret_cast< UException * >(argp1);
-  result = (arg1)->getError();
-  resultobj = SWIG_From_std_string(static_cast< std::string >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_UException_err_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  UException *arg1 = (UException *) 0 ;
-  std::string *arg2 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res2 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"OO:UException_err_set",&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UException, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UException_err_set" "', argument " "1"" of type '" "UException *""'"); 
-  }
-  arg1 = reinterpret_cast< UException * >(argp1);
-  {
-    std::string *ptr = (std::string *)0;
-    res2 = SWIG_AsPtr_std_string(obj1, &ptr);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "UException_err_set" "', argument " "2"" of type '" "std::string const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "UException_err_set" "', argument " "2"" of type '" "std::string const &""'"); 
-    }
-    arg2 = ptr;
-  }
-  if (arg1) (arg1)->err = *arg2;
-  resultobj = SWIG_Py_Void();
-  if (SWIG_IsNewObj(res2)) delete arg2;
-  return resultobj;
-fail:
-  if (SWIG_IsNewObj(res2)) delete arg2;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_UException_err_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  UException *arg1 = (UException *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  std::string *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:UException_err_get",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UException, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "UException_err_get" "', argument " "1"" of type '" "UException *""'"); 
-  }
-  arg1 = reinterpret_cast< UException * >(argp1);
-  result = (std::string *) & ((arg1)->err);
-  resultobj = SWIG_From_std_string(static_cast< std::string >(*result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *UException_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UException, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_new_UTimeOut__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  UTimeOut *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_UTimeOut")) SWIG_fail;
-  result = (UTimeOut *)new UTimeOut();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UTimeOut, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_UTimeOut__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::string *arg1 = 0 ;
-  int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  UTimeOut *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:new_UTimeOut",&obj0)) SWIG_fail;
-  {
-    std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_UTimeOut" "', argument " "1"" of type '" "std::string const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_UTimeOut" "', argument " "1"" of type '" "std::string const &""'"); 
-    }
-    arg1 = ptr;
-  }
-  result = (UTimeOut *)new UTimeOut((std::string const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UTimeOut, SWIG_POINTER_NEW |  0 );
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return resultobj;
-fail:
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_UTimeOut(PyObject *self, PyObject *args) {
-  Py_ssize_t argc;
-  PyObject *argv[2] = {
-    0
-  };
-  Py_ssize_t ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 0) {
-    return _wrap_new_UTimeOut__SWIG_0(self, args);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_new_UTimeOut__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_UTimeOut'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UTimeOut::UTimeOut()\n"
-    "    UTimeOut::UTimeOut(std::string const &)\n");
-  return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_UTimeOut(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  UTimeOut *arg1 = (UTimeOut *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_UTimeOut",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UTimeOut, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UTimeOut" "', argument " "1"" of type '" "UTimeOut *""'"); 
-  }
-  arg1 = reinterpret_cast< UTimeOut * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *UTimeOut_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UTimeOut, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_new_USysError__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  USysError *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)":new_USysError")) SWIG_fail;
-  result = (USysError *)new USysError();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_USysError, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_USysError__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::string *arg1 = 0 ;
-  int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  USysError *result = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:new_USysError",&obj0)) SWIG_fail;
-  {
-    std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_USysError" "', argument " "1"" of type '" "std::string const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_USysError" "', argument " "1"" of type '" "std::string const &""'"); 
-    }
-    arg1 = ptr;
-  }
-  result = (USysError *)new USysError((std::string const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_USysError, SWIG_POINTER_NEW |  0 );
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return resultobj;
-fail:
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_USysError(PyObject *self, PyObject *args) {
-  Py_ssize_t argc;
-  PyObject *argv[2] = {
-    0
-  };
-  Py_ssize_t ii;
-  
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 0) {
-    return _wrap_new_USysError__SWIG_0(self, args);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_new_USysError__SWIG_1(self, args);
-    }
-  }
-  
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_USysError'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    USysError::USysError()\n"
-    "    USysError::USysError(std::string const &)\n");
-  return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_USysError(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  USysError *arg1 = (USysError *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-  
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_USysError",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_USysError, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_USysError" "', argument " "1"" of type '" "USysError *""'"); 
-  }
-  arg1 = reinterpret_cast< USysError * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *USysError_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_USysError, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *_wrap_new_UValidateError__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  UValidateError *result = 0 ;
-
-  if (!PyArg_ParseTuple(args,(char *)":new_UValidateError")) SWIG_fail;
-  result = (UValidateError *)new UValidateError();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UValidateError, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_UValidateError__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  std::string *arg1 = 0 ;
-  int res1 = SWIG_OLDOBJ ;
-  PyObject * obj0 = 0 ;
-  UValidateError *result = 0 ;
-
-  if (!PyArg_ParseTuple(args,(char *)"O:new_UValidateError",&obj0)) SWIG_fail;
-  {
-    std::string *ptr = (std::string *)0;
-    res1 = SWIG_AsPtr_std_string(obj0, &ptr);
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_UValidateError" "', argument " "1"" of type '" "std::string const &""'");
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_UValidateError" "', argument " "1"" of type '" "std::string const &""'");
-    }
-    arg1 = ptr;
-  }
-  result = (UValidateError *)new UValidateError((std::string const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_UValidateError, SWIG_POINTER_NEW |  0 );
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return resultobj;
-fail:
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_UValidateError(PyObject *self, PyObject *args) {
-  Py_ssize_t argc;
-  PyObject *argv[2] = {
-    0
-  };
-  Py_ssize_t ii;
-
-  if (!PyTuple_Check(args)) SWIG_fail;
-  argc = args ? PyObject_Length(args) : 0;
-  for (ii = 0; (ii < 1) && (ii < argc); ii++) {
-    argv[ii] = PyTuple_GET_ITEM(args,ii);
-  }
-  if (argc == 0) {
-    return _wrap_new_UValidateError__SWIG_0(self, args);
-  }
-  if (argc == 1) {
-    int _v;
-    int res = SWIG_AsPtr_std_string(argv[0], (std::string**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_new_UValidateError__SWIG_1(self, args);
-    }
-  }
-
-fail:
-  SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'new_UValidateError'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    UValidateError::UValidateError()\n"
-    "    UValidateError::UValidateError(std::string const &)\n");
-  return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_UValidateError(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  UValidateError *arg1 = (UValidateError *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject * obj0 = 0 ;
-
-  if (!PyArg_ParseTuple(args,(char *)"O:delete_UValidateError",&obj0)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_UValidateError, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_UValidateError" "', argument " "1"" of type '" "UValidateError *""'");
-  }
-  arg1 = reinterpret_cast< UValidateError * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *UValidateError_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj;
-  if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_UValidateError, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"SWIG_PyInstanceMethod_New", (PyCFunction)SWIG_PyInstanceMethod_New, METH_O, NULL},
 	 { (char *)"new_UModbus", _wrap_new_UModbus, METH_VARARGS, NULL},
@@ -5723,65 +5190,29 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"UModbus_getBit", _wrap_UModbus_getBit, METH_VARARGS, NULL},
 	 { (char *)"UModbus_mbwrite", _wrap_UModbus_mbwrite, METH_VARARGS, NULL},
 	 { (char *)"UModbus_swigregister", UModbus_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_UException", _wrap_new_UException, METH_VARARGS, NULL},
-	 { (char *)"delete_UException", _wrap_delete_UException, METH_VARARGS, NULL},
-	 { (char *)"UException_getError", _wrap_UException_getError, METH_VARARGS, NULL},
-	 { (char *)"UException_err_set", _wrap_UException_err_set, METH_VARARGS, NULL},
-	 { (char *)"UException_err_get", _wrap_UException_err_get, METH_VARARGS, NULL},
-	 { (char *)"UException_swigregister", UException_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_UTimeOut", _wrap_new_UTimeOut, METH_VARARGS, NULL},
-	 { (char *)"delete_UTimeOut", _wrap_delete_UTimeOut, METH_VARARGS, NULL},
-	 { (char *)"UTimeOut_swigregister", UTimeOut_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_USysError", _wrap_new_USysError, METH_VARARGS, NULL},
-	 { (char *)"delete_USysError", _wrap_delete_USysError, METH_VARARGS, NULL},
-	 { (char *)"USysError_swigregister", USysError_swigregister, METH_VARARGS, NULL},
-	 { (char *)"new_UValidateError", _wrap_new_UValidateError, METH_VARARGS, NULL},
-	 { (char *)"delete_UValidateError", _wrap_delete_UValidateError, METH_VARARGS, NULL},
-	 { (char *)"UValidateError_swigregister", UValidateError_swigregister, METH_VARARGS, NULL},
 	 { NULL, NULL, 0, NULL }
 };
 
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_UTimeOutTo_p_UException(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((UException *)  ((UTimeOut *) x));
-}
-static void *_p_USysErrorTo_p_UException(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((UException *)  ((USysError *) x));
-}
-static void *_p_UValidateErrorTo_p_UException(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((UException *)  ((UValidateError *) x));
-}
 static swig_type_info _swigt__p_UException = {"_p_UException", "UException *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_UModbus = {"_p_UModbus", "UModbus *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_USysError = {"_p_USysError", "USysError *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UTimeOut = {"_p_UTimeOut", "UTimeOut *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_UValidateError = {"_p_UValidateError", "UValidateError *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
   &_swigt__p_UException,
   &_swigt__p_UModbus,
-  &_swigt__p_USysError,
-  &_swigt__p_UTimeOut,
-  &_swigt__p_UValidateError,
   &_swigt__p_char,
 };
 
-static swig_cast_info _swigc__p_UException[] = {  {&_swigt__p_UException, 0, 0, 0},  {&_swigt__p_UTimeOut, _p_UTimeOutTo_p_UException, 0, 0},  {&_swigt__p_USysError, _p_USysErrorTo_p_UException, 0, 0},  {&_swigt__p_UValidateError, _p_UValidateErrorTo_p_UException, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_UException[] = {  {&_swigt__p_UException, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_UModbus[] = {  {&_swigt__p_UModbus, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_USysError[] = {  {&_swigt__p_USysError, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UTimeOut[] = {  {&_swigt__p_UTimeOut, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_UValidateError[] = {  {&_swigt__p_UValidateError, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_UException,
   _swigc__p_UModbus,
-  _swigc__p_USysError,
-  _swigc__p_UTimeOut,
-  _swigc__p_UValidateError,
   _swigc__p_char,
 };
 

python/lib/pyUniSet/pyUModbus.py

@@ -130,95 +130,6 @@ class UModbus:
 UModbus_swigregister = _pyUModbus.UModbus_swigregister
 UModbus_swigregister(UModbus)
 
-class UException(Exception):
-    __swig_setmethods__ = {}
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UException, name, value)
-    __swig_getmethods__ = {}
-    __getattr__ = lambda self, name: _swig_getattr(self, UException, name)
-    __repr__ = _swig_repr
-
-    def __init__(self, *args):
-        this = _pyUModbus.new_UException(*args)
-        try:
-            self.this.append(this)
-        except Exception:
-            self.this = this
-    __swig_destroy__ = _pyUModbus.delete_UException
-    __del__ = lambda self: None
-
-    def getError(self):
-        return _pyUModbus.UException_getError(self)
-    __swig_setmethods__["err"] = _pyUModbus.UException_err_set
-    __swig_getmethods__["err"] = _pyUModbus.UException_err_get
-UException_swigregister = _pyUModbus.UException_swigregister
-UException_swigregister(UException)
-
-class UTimeOut(UException):
-    __swig_setmethods__ = {}
-    for _s in [UException]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UTimeOut, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UException]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, UTimeOut, name)
-    __repr__ = _swig_repr
-
-    def __init__(self, *args):
-        this = _pyUModbus.new_UTimeOut(*args)
-        try:
-            self.this.append(this)
-        except Exception:
-            self.this = this
-    __swig_destroy__ = _pyUModbus.delete_UTimeOut
-    __del__ = lambda self: None
-UTimeOut_swigregister = _pyUModbus.UTimeOut_swigregister
-UTimeOut_swigregister(UTimeOut)
-
-class USysError(UException):
-    __swig_setmethods__ = {}
-    for _s in [UException]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, USysError, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UException]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, USysError, name)
-    __repr__ = _swig_repr
-
-    def __init__(self, *args):
-        this = _pyUModbus.new_USysError(*args)
-        try:
-            self.this.append(this)
-        except Exception:
-            self.this = this
-    __swig_destroy__ = _pyUModbus.delete_USysError
-    __del__ = lambda self: None
-USysError_swigregister = _pyUModbus.USysError_swigregister
-USysError_swigregister(USysError)
-
-class UValidateError(UException):
-    __swig_setmethods__ = {}
-    for _s in [UException]:
-        __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {}))
-    __setattr__ = lambda self, name, value: _swig_setattr(self, UValidateError, name, value)
-    __swig_getmethods__ = {}
-    for _s in [UException]:
-        __swig_getmethods__.update(getattr(_s, '__swig_getmethods__', {}))
-    __getattr__ = lambda self, name: _swig_getattr(self, UValidateError, name)
-    __repr__ = _swig_repr
-
-    def __init__(self, *args):
-        this = _pyUModbus.new_UValidateError(*args)
-        try:
-            self.this.append(this)
-        except Exception:
-            self.this = this
-    __swig_destroy__ = _pyUModbus.delete_UValidateError
-    __del__ = lambda self: None
-UValidateError_swigregister = _pyUModbus.UValidateError_swigregister
-UValidateError_swigregister(UValidateError)
-
 # This file is compatible with both classic and new-style classes.