revert 12339

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12401 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/esl/python/_ESL.py → libs/esl/python/ESL.py

@@ -4,7 +4,7 @@
 # Don't modify this file, modify the SWIG interface instead.
 # This file is compatible with both classic and new-style classes.
 
-import __ESL
+import _ESL
 import new
 new_instancemethod = new.instancemethod
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
@@ -40,29 +40,29 @@ class ESLevent:
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, ESLevent, name)
     __repr__ = _swig_repr
-    __swig_setmethods__["event"] = __ESL.ESLevent_event_set
-    __swig_getmethods__["event"] = __ESL.ESLevent_event_get
-    __swig_setmethods__["serialized_string"] = __ESL.ESLevent_serialized_string_set
-    __swig_getmethods__["serialized_string"] = __ESL.ESLevent_serialized_string_get
-    __swig_setmethods__["mine"] = __ESL.ESLevent_mine_set
-    __swig_getmethods__["mine"] = __ESL.ESLevent_mine_get
+    __swig_setmethods__["event"] = _ESL.ESLevent_event_set
+    __swig_getmethods__["event"] = _ESL.ESLevent_event_get
+    __swig_setmethods__["serialized_string"] = _ESL.ESLevent_serialized_string_set
+    __swig_getmethods__["serialized_string"] = _ESL.ESLevent_serialized_string_get
+    __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 = apply(_ESL.new_ESLevent, args)
         try: self.this.append(this)
         except: self.this = this
-    __swig_destroy__ = __ESL.delete_ESLevent
+    __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 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)
-ESLevent_swigregister = __ESL.ESLevent_swigregister
+    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 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)
+ESLevent_swigregister = _ESL.ESLevent_swigregister
 ESLevent_swigregister(ESLevent)
 
 class ESLconnection:
@@ -72,28 +72,28 @@ 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 = apply(_ESL.new_ESLconnection, args)
         try: self.this.append(this)
         except: self.this = this
-    __swig_destroy__ = __ESL.delete_ESLconnection
+    __swig_destroy__ = _ESL.delete_ESLconnection
     __del__ = lambda self : None;
-    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 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 setBlockingExecute(*args): return apply(__ESL.ESLconnection_setBlockingExecute, args)
-    def setEventLock(*args): return apply(__ESL.ESLconnection_setEventLock, args)
-ESLconnection_swigregister = __ESL.ESLconnection_swigregister
+    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 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 setBlockingExecute(*args): return apply(_ESL.ESLconnection_setBlockingExecute, args)
+    def setEventLock(*args): return apply(_ESL.ESLconnection_setEventLock, args)
+ESLconnection_swigregister = _ESL.ESLconnection_swigregister
 ESLconnection_swigregister(ESLconnection)
 
-eslSetLogLevel = __ESL.eslSetLogLevel
+eslSetLogLevel = _ESL.eslSetLogLevel
 
 

libs/esl/python/Makefile

@@ -4,7 +4,7 @@ LOCAL_LDFLAGS=-lpython2.4
 all: _ESL.so
 
 esl_wrap.cpp:
-	swig -module _ESL -classic -python -c++ -DMULTIPLICITY -I../src/include -o esl_wrap.cpp ../ESL.i
+	swig -module ESL -classic -python -c++ -DMULTIPLICITY -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

libs/esl/python/esl_wrap.cpp

@@ -2515,11 +2515,11 @@ static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #endif
 
 /*-----------------------------------------------
-              @(target):= __ESL.so
+              @(target):= _ESL.so
   ------------------------------------------------*/
-#define SWIG_init    init__ESL
+#define SWIG_init    init_ESL
 
-#define SWIG_name    "__ESL"
+#define SWIG_name    "_ESL"
 
 #define SWIGVERSION 0x010335 
 #define SWIG_VERSION SWIGVERSION