Попытка добиться работы from uniset import *

python/lib/UGlobal.py

@@ -6,7 +6,7 @@ import time
 import sys
 
 def is_id( str_id ):
-    if str_id.__class__.__name__ == "int" or str_id.__class__.__name__ == "long":
+    if isinstance(str_id,int) or isinstance(str_id,long):
        return True
 
     if str_id.strip().isdigit():
@@ -19,10 +19,10 @@ def to_int(s):
     if s == None or s == "":
        return 0
 
-    if s.__class__.__name__ == "int" or s.__class__.__name__ == "long":
+    if isinstance(s,int) or isinstance(s,long):
        return s
 
-    if s.__class__.__name__ == "float":
+    if isinstance(s,float):
        return int(s)
 
     if len(s)>2 and s[0] == '0' and s[1] == 'x':

python/lib/__init__.py

 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from UInterface import *
-from UGlobal import *
-from UniXML import *
+__all__=["UInterface","UGlobal","UniXML","pyUInterface","pyUniSet","pyUModbus","pyUConnector","pyUExceptions"]
 
-from pyUExceptions import *
-from pyUniSet import *
-from pyUModbus import *
-from pyUConnector import *
+#from UInterface import *
+#from UGlobal import *
+#from UniXML import *
+
+#from pyUInterface import *
+#from pyUniSet import *
+#from pyUModbus import *
+#from pyUConnector import *
+#from pyUExceptions import *

python/lib/pyUniSet/Makefile.am

@@ -4,12 +4,12 @@ python_SCRIPTS = pyUniSet.py pyUConnector.py pyUModbus.py pyUExceptions.py
 
 pyexec_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la _pyUniSet.la 
 
-_pyUniSet_la_SOURCES 	= pyUInterface.cc UInterface_wrap.cxx
+_pyUniSet_la_SOURCES 	= PyUInterface.cc UInterface_wrap.cxx
 _pyUniSet_la_CXXFLAGS	= $(UNISET_CFLAGS) $(PYTHON_CFLAGS) 
 _pyUniSet_la_LDFLAGS 	= -module -avoid-version
 _pyUniSet_la_LIBADD 	= $(UNISET_LIBS) $(PYTHON_LIBS)
 
-UInterface_wrap.cxx: UInterface.i pyUInterface.h
+UInterface_wrap.cxx: UInterface.i PyUInterface.h
 	swig -python -c++ -classic UInterface.i
 
 _pyUConnector_la_SOURCES 	= UConnector.cc UConnector_wrap.cxx 

python/lib/pyUniSet/pyUInterface.cc → python/lib/pyUniSet/PyUInterface.cc

@@ -4,7 +4,7 @@
 #include "UInterface.h"
 #include "Configuration.h"
 #include "UniSetTypes.h"
-#include "pyUInterface.h"
+#include "PyUInterface.h"
 //---------------------------------------------------------------------------
 using namespace std;
 //---------------------------------------------------------------------------
@@ -38,7 +38,7 @@ long pyUInterface::getValue( long id )throw(UException)
 {
     if( !UniSetTypes::conf || !ui )
       throw USysError();
-    
+
     UniversalIO::IOType t = UniSetTypes::conf->getIOType(id);
     try
     {
@@ -50,7 +50,7 @@ long pyUInterface::getValue( long id )throw(UException)
             case UniversalIO::AO:
                 return ui->getValue(id);
             break;
-                
+
             default:
             {
               ostringstream e;
@@ -71,7 +71,7 @@ long pyUInterface::getValue( long id )throw(UException)
     {
         throw UException("(getValue): catch...");
     }
-    
+
     throw UException("(getValue): unknown error");
 }
 //---------------------------------------------------------------------------
@@ -79,7 +79,7 @@ void pyUInterface::setValue( long id, long val )throw(UException)
 {
     if( !UniSetTypes::conf || !ui )
       throw USysError();
-    
+
     UniversalIO::IOType t = UniSetTypes::conf->getIOType(id);
     try
     {
@@ -91,7 +91,7 @@ void pyUInterface::setValue( long id, long val )throw(UException)
             case UniversalIO::AO:
                 ui->setValue(id,val);
             break;
-                
+
             default:
             {
               ostringstream e;
@@ -118,7 +118,7 @@ long pyUInterface::getSensorID( const char* name )
 {
     if( UniSetTypes::conf )
       return UniSetTypes::conf->getSensorID(name);
-    
+
     return -1;
 }
 //---------------------------------------------------------------------------
@@ -126,7 +126,7 @@ const char* pyUInterface::getName( long id )
 {
     if( UniSetTypes::conf )
         return UniSetTypes::conf->oind->getMapName(id).c_str();
-        
+
     return "";
 }
 //---------------------------------------------------------------------------
@@ -134,7 +134,7 @@ const char* pyUInterface::getShortName( long id )
 {
     if( UniSetTypes::conf )
         return ORepHelpers::getShortName(UniSetTypes::conf->oind->getMapName(id)).c_str();
-        
+
     return "";
 }
 //---------------------------------------------------------------------------
@@ -142,7 +142,7 @@ const char* pyUInterface::getTextName( long id )
 {
     if( UniSetTypes::conf )
         return UniSetTypes::conf->oind->getTextName(id).c_str();
-        
+
     return "";
 }
 //---------------------------------------------------------------------------
@@ -150,7 +150,7 @@ const char* pyUInterface::getConfFileName()
 {
     if( UniSetTypes::conf )
         return UniSetTypes::conf->getConfFileName().c_str();
-        
+
     return "";
 
 }

python/lib/pyUniSet/pyUInterface.h → python/lib/pyUniSet/PyUInterface.h

 #ifndef pyUInterface_H_
 #define pyUInterface_H_
-// -------------------------------------------------------------------------- 
+// --------------------------------------------------------------------------
 #include <string>
 #include "UTypes.h"
 #include "UExceptions.h"
-// -------------------------------------------------------------------------- 
+// --------------------------------------------------------------------------
 namespace pyUInterface
 {
     void uniset_init_params( UTypes::Params* p, const char* xmlfile )throw(UException);
@@ -15,13 +15,13 @@ namespace pyUInterface
     void setValue( long id, long val )throw(UException);
 
     long getSensorID( const char* );
-    
+
     const char* getShortName( long id );
     const char* getName( long id );
     const char* getTextName( long id );
-    
+
     const char* getConfFileName();
-    
+
 }
 //---------------------------------------------------------------------------
 #endif

python/lib/pyUniSet/UConnector.cc

@@ -71,10 +71,6 @@ long UConnector::getValue( long id, long node )throw(UException)
     {
          return ui->getValue(id,node);
     }
-    catch( UException& ex )
-    {
-        throw;
-    }
     catch( UniSetTypes::Exception& ex )
     {
         throw UException(ex.what());
@@ -100,10 +96,6 @@ void UConnector::setValue( long id, long val, long node )throw(UException)
     {
         ui->setValue(id,val,node);
     }
-    catch( UException& ex )
-    {
-        throw;
-    }
     catch( UniSetTypes::Exception& ex )
     {
         throw UException(ex.what());

python/lib/pyUniSet/UConnector.h

@@ -14,7 +14,7 @@ class UConnector
       UConnector( UTypes::Params* p, const char* xmlfile )throw(UException);
       ~UConnector();
 
-        inline const char* getUIType(){ return "uniset"; }
+      inline const char* getUIType(){ return "uniset"; }
 
       const char* getConfFileName();
       long getValue( long id, long node )throw(UException);

python/lib/pyUniSet/UExceptions.h

@@ -24,7 +24,7 @@ struct UTimeOut:
 struct USysError:
     public UException
 {
-    USysError():UException("UTimeOut"){}
+    USysError():UException("USysError"){}
     USysError( const std::string& e ):UException(e){}
     ~USysError(){}
 };

python/lib/pyUniSet/UInterface.i

@@ -6,10 +6,10 @@
 
 %module pyUniSet
 %{
-#include "pyUInterface.h"
+#include "PyUInterface.h"
 %}
 
 /* Для генерации классов и констант в Питоне */
-%include "pyUInterface.h"
+%include "PyUInterface.h"
 %include "UTypes.h"
 %include "UExceptions.h"

python/lib/pyUniSet/UInterface_wrap.cxx

@@ -3055,7 +3055,7 @@ namespace swig {
 }
 
 
-#include "pyUInterface.h"
+#include "PyUInterface.h"
 
 
 SWIGINTERN swig_type_info*

python/tests/UConnector/testUC.py

@@ -3,13 +3,9 @@
 
 import sys
 
-sys.path.append('./.libs/')
-sys.path.append('../../lib/pyUniSet/.libs/')
-sys.path.append('../../lib/pyUniSet/')
+#sys.path.append('../lib/')
 
-#from pyUniSet import *
-from pyUConnector import *
-from pyUExceptions import *
+from uniset import *
 
 if __name__ == "__main__":
 	
@@ -45,9 +41,14 @@ if __name__ == "__main__":
 			print "(1)setValue exception: " + str(e.getError())
 
 		try:
-			print "(1)getValue: %d=%d" % ( 3, uc1.getValue(3,DefaultID) )
+			print "(2)getValue: %d=%d" % ( 3, uc1.getValue(3,DefaultID) )
 		except UException, e:
-			print "(1)getValue exception: " + str(e.getError())
+			print "(2)getValue exception: " + str(e.getError())
+
+		try:
+			print "(3)getValue: %d=%d" % ( 100, uc1.getValue(100,DefaultID) )
+		except UException, e:
+			print "(3)getValue exception: " + str(e.getError())
 
 	except UException, e:
 		print "(testUI): catch exception: " + str(e.getError())