update esl swig to swig 2.0 and reswig

libs/esl/python/ESL.py

@@ -1,21 +1,44 @@
 # This file was automatically generated by SWIG (http://www.swig.org).
-# Version 1.3.35
+# Version 2.0.12
 #
-# Don't modify this file, modify the SWIG interface instead.
-# This file is compatible with both classic and new-style classes.
+# Do not make changes to this file unless you know what you are doing--modify
+# the SWIG interface file instead.
 
-import _ESL
-import new
-new_instancemethod = new.instancemethod
+
+
+
+
+from sys import version_info
+if version_info >= (2,6,0):
+    def swig_import_helper():
+        from os.path import dirname
+        import imp
+        fp = None
+        try:
+            fp, pathname, description = imp.find_module('_ESL', [dirname(__file__)])
+        except ImportError:
+            import _ESL
+            return _ESL
+        if fp is not None:
+            try:
+                _mod = imp.load_module('_ESL', fp, pathname, description)
+            finally:
+                fp.close()
+            return _mod
+    _ESL = swig_import_helper()
+    del swig_import_helper
+else:
+    import _ESL
+del version_info
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
     if (name == "thisown"): return self.this.own(value)
     if (name == "this"):
-        if type(value).__name__ == 'PySwigObject':
+        if type(value).__name__ == 'SwigPyObject':
             self.__dict__[name] = value
             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
-    if (not static) or hasattr(self,name):
+    if (not static):
         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
@@ -27,7 +50,7 @@ def _swig_getattr(self,class_type,name):
     if (name == "thisown"): return self.this.own()
     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
-    raise AttributeError,name
+    raise AttributeError(name)
 
 def _swig_repr(self):
     try: strthis = "proxy of " + self.this.__repr__()
@@ -47,23 +70,23 @@ class ESLevent:
     __swig_setmethods__["mine"] = _ESL.ESLevent_mine_set
     __swig_getmethods__["mine"] = _ESL.ESLevent_mine_get
     def __init__(self, *args): 
-        this = apply(_ESL.new_ESLevent, args)
+        this = _ESL.new_ESLevent(*args)
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ESL.delete_ESLevent
     __del__ = lambda self : None;
-    def serialize(*args): return apply(_ESL.ESLevent_serialize, args)
-    def setPriority(*args): return apply(_ESL.ESLevent_setPriority, args)
-    def getHeader(*args): return apply(_ESL.ESLevent_getHeader, args)
-    def getBody(*args): return apply(_ESL.ESLevent_getBody, args)
-    def getType(*args): return apply(_ESL.ESLevent_getType, args)
-    def addBody(*args): return apply(_ESL.ESLevent_addBody, args)
-    def addHeader(*args): return apply(_ESL.ESLevent_addHeader, args)
-    def pushHeader(*args): return apply(_ESL.ESLevent_pushHeader, args)
-    def unshiftHeader(*args): return apply(_ESL.ESLevent_unshiftHeader, args)
-    def delHeader(*args): return apply(_ESL.ESLevent_delHeader, args)
-    def firstHeader(*args): return apply(_ESL.ESLevent_firstHeader, args)
-    def nextHeader(*args): return apply(_ESL.ESLevent_nextHeader, args)
+    def serialize(self, format=None): return _ESL.ESLevent_serialize(self, format)
+    def setPriority(self, *args): return _ESL.ESLevent_setPriority(self, *args)
+    def getHeader(self, *args): return _ESL.ESLevent_getHeader(self, *args)
+    def getBody(self): return _ESL.ESLevent_getBody(self)
+    def getType(self): return _ESL.ESLevent_getType(self)
+    def addBody(self, *args): return _ESL.ESLevent_addBody(self, *args)
+    def addHeader(self, *args): return _ESL.ESLevent_addHeader(self, *args)
+    def pushHeader(self, *args): return _ESL.ESLevent_pushHeader(self, *args)
+    def unshiftHeader(self, *args): return _ESL.ESLevent_unshiftHeader(self, *args)
+    def delHeader(self, *args): return _ESL.ESLevent_delHeader(self, *args)
+    def firstHeader(self): return _ESL.ESLevent_firstHeader(self)
+    def nextHeader(self): return _ESL.ESLevent_nextHeader(self)
 ESLevent_swigregister = _ESL.ESLevent_swigregister
 ESLevent_swigregister(ESLevent)
 
@@ -74,32 +97,36 @@ class ESLconnection:
     __getattr__ = lambda self, name: _swig_getattr(self, ESLconnection, name)
     __repr__ = _swig_repr
     def __init__(self, *args): 
-        this = apply(_ESL.new_ESLconnection, args)
+        this = _ESL.new_ESLconnection(*args)
         try: self.this.append(this)
         except: self.this = this
     __swig_destroy__ = _ESL.delete_ESLconnection
     __del__ = lambda self : None;
-    def socketDescriptor(*args): return apply(_ESL.ESLconnection_socketDescriptor, args)
-    def connected(*args): return apply(_ESL.ESLconnection_connected, args)
-    def getInfo(*args): return apply(_ESL.ESLconnection_getInfo, args)
-    def send(*args): return apply(_ESL.ESLconnection_send, args)
-    def sendRecv(*args): return apply(_ESL.ESLconnection_sendRecv, args)
-    def api(*args): return apply(_ESL.ESLconnection_api, args)
-    def bgapi(*args): return apply(_ESL.ESLconnection_bgapi, args)
-    def sendEvent(*args): return apply(_ESL.ESLconnection_sendEvent, args)
-    def sendMSG(*args): return apply(_ESL.ESLconnection_sendMSG, args)
-    def recvEvent(*args): return apply(_ESL.ESLconnection_recvEvent, args)
-    def recvEventTimed(*args): return apply(_ESL.ESLconnection_recvEventTimed, args)
-    def filter(*args): return apply(_ESL.ESLconnection_filter, args)
-    def events(*args): return apply(_ESL.ESLconnection_events, args)
-    def execute(*args): return apply(_ESL.ESLconnection_execute, args)
-    def executeAsync(*args): return apply(_ESL.ESLconnection_executeAsync, args)
-    def setAsyncExecute(*args): return apply(_ESL.ESLconnection_setAsyncExecute, args)
-    def setEventLock(*args): return apply(_ESL.ESLconnection_setEventLock, args)
-    def disconnect(*args): return apply(_ESL.ESLconnection_disconnect, args)
+    def socketDescriptor(self): return _ESL.ESLconnection_socketDescriptor(self)
+    def connected(self): return _ESL.ESLconnection_connected(self)
+    def getInfo(self): return _ESL.ESLconnection_getInfo(self)
+    def send(self, *args): return _ESL.ESLconnection_send(self, *args)
+    def sendRecv(self, *args): return _ESL.ESLconnection_sendRecv(self, *args)
+    def api(self, *args): return _ESL.ESLconnection_api(self, *args)
+    def bgapi(self, *args): return _ESL.ESLconnection_bgapi(self, *args)
+    def sendEvent(self, *args): return _ESL.ESLconnection_sendEvent(self, *args)
+    def sendMSG(self, *args): return _ESL.ESLconnection_sendMSG(self, *args)
+    def recvEvent(self): return _ESL.ESLconnection_recvEvent(self)
+    def recvEventTimed(self, *args): return _ESL.ESLconnection_recvEventTimed(self, *args)
+    def filter(self, *args): return _ESL.ESLconnection_filter(self, *args)
+    def events(self, *args): return _ESL.ESLconnection_events(self, *args)
+    def execute(self, *args): return _ESL.ESLconnection_execute(self, *args)
+    def executeAsync(self, *args): return _ESL.ESLconnection_executeAsync(self, *args)
+    def setAsyncExecute(self, *args): return _ESL.ESLconnection_setAsyncExecute(self, *args)
+    def setEventLock(self, *args): return _ESL.ESLconnection_setEventLock(self, *args)
+    def disconnect(self): return _ESL.ESLconnection_disconnect(self)
 ESLconnection_swigregister = _ESL.ESLconnection_swigregister
 ESLconnection_swigregister(ESLconnection)
 
+
+def eslSetLogLevel(*args):
+  return _ESL.eslSetLogLevel(*args)
 eslSetLogLevel = _ESL.eslSetLogLevel
+# This file is compatible with both classic and new-style classes.
 
 

libs/esl/python/Makefile

@@ -5,7 +5,7 @@ SITE_DIR=$(DESTDIR)/`python -c "from distutils.sysconfig import get_python_lib;
 all: _ESL.so
 
 esl_wrap.cpp:
-	swig -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig2.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
 
 esl_wrap.o: esl_wrap.cpp
 	$(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o