changing getLogger to return a custom Python impl

1 files changed, 6 insertions, 27 deletions

diff --git a/py/modules/IcePy/Logger.cpp b/py/modules/IcePy/Logger.cpp
index 406d077ca49..03dfd2300cd 100644
--- a/py/modules/IcePy/Logger.cpp
+++ b/py/modules/IcePy/Logger.cpp
@@ -11,8 +11,6 @@
 #   include <IceUtil/Config.h>
 #endif
 #include <Logger.h>
-#include <Util.h>
-#include <Ice/Logger.h>
 
 using namespace std;
 using namespace IcePy;
@@ -28,25 +26,6 @@ struct LoggerObject
     Ice::LoggerPtr* logger;
 };
 
-//
-// LoggerWrapper delegates Logger operations to a Python implementation.
-//
-class LoggerWrapper : public Ice::Logger
-{
-public:
-
-    LoggerWrapper(PyObject*);
-
-    virtual void print(const string&);
-    virtual void trace(const string&, const string&);
-    virtual void warning(const string&);
-    virtual void error(const string&);
-
-private:
-
-    PyObjectHandle _logger;
-};
-
 }
 
 IcePy::LoggerWrapper::LoggerWrapper(PyObject* logger) :
@@ -104,6 +83,12 @@ IcePy::LoggerWrapper::error(const string& message)
     }
 }
 
+PyObject*
+IcePy::LoggerWrapper::getObject()
+{
+    return _logger.get();
+}
+
 #ifdef WIN32
 extern "C"
 #endif
@@ -329,9 +314,3 @@ IcePy::createLogger(const Ice::LoggerPtr& logger)
     }
     return (PyObject*)obj;
 }
-
-Ice::LoggerPtr
-IcePy::wrapLogger(PyObject* p)
-{
-    return new LoggerWrapper(p);
-}