(python): вернул UInterface

conf/libuniset.spec

@@ -7,7 +7,7 @@
 
 Name: libuniset
 Version: 1.6
-Release: alt3
+Release: alt4
 
 Summary: UniSet - library for building distributed industrial control systems
 
@@ -316,6 +316,9 @@ mv -f %buildroot%python_sitelibdir/%oname/%oname.py %buildroot%python_sitelibdir
 %exclude %_pkgconfigdir/libUniSet.pc
 
 %changelog
+* Tue Mar 05 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt4
+- restote UInterface for python
+
 * Tue Mar 05 2013 Pavel Vainerman <pv@altlinux.ru> 1.6-alt3
 - add doc for python bindings
 - rebuild wrapper files with new swig

python/lib/UInterface.py

@@ -3,10 +3,6 @@
 
 import sys
 
-sys.path.append('./.libs/')
-sys.path.append('pyUniSet/.libs/')
-sys.path.append('pyUniSet/')
-
 from pyUExceptions import *
 from pyUConnector import *
 from pyUModbus import *

python/lib/pyUniSet/Makefile.am

 if DISABLE_PYTHON
 else
-pyexec_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la 
-#_pyUniSet.la 
-
-# DEPRECATED (use UConnector)
-#_pyUniSet_la_SOURCES 	= UInterface.cc UInterface_wrap.cxx
-#_pyUniSet_la_CXXFLAGS	= $(UNISET_CFLAGS) $(PYTHON_CFLAGS) 
-#_pyUniSet_la_LDFLAGS 	= -module -avoid-version
-#_pyUniSet_la_LIBADD 	= $(UNISET_LIBS) $(PYTHON_LIBS)
+pyexec_LTLIBRARIES = _pyUConnector.la _pyUModbus.la _pyUExceptions.la _pyUniSet.la 
+
+_pyUniSet_la_SOURCES 	= UInterface.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 UInterface.h
 	swig -python -c++ -classic UInterface.i

python/lib/uniset.py

@@ -12,3 +12,5 @@ sys.path.append( _py_uniset_dir )
 from pyUConnector import *
 from pyUExceptions import *
 from pyUModbus import *
+
+import UniXML