Call ComposedSubHandler._attr() with cont parameter (closes #31)

[software/pymin.git] / pymin / pymindaemon.py

diff --git a/pymin/pymindaemon.py b/pymin/pymindaemon.py
index 6f4fa736534147539873a93d2be8b5f3dcf3a635..6e080cb6e27deba19067b60bd469edb33f31924a 100644 (file)
--- a/pymin/pymindaemon.py
+++ b/pymin/pymindaemon.py
@@ -114,13 +114,13 @@ class PyminDaemon(eventloop.EventLoop):
         try:
             result = self.dispatcher.dispatch(unicode(msg, 'utf-8'))
             if result is not None:
         try:
             result = self.dispatcher.dispatch(unicode(msg, 'utf-8'))
             if result is not None:

-                result = serializer.serialize(result)
+                result = unicode(serializer.serialize(result), 'utf-8')

             response = u'OK'
         except dispatcher.Error, e:
             result = unicode(e) + u'\n'
         except formencode.Invalid, e:
             if e.error_dict:
             response = u'OK'
         except dispatcher.Error, e:
             result = unicode(e) + u'\n'
         except formencode.Invalid, e:
             if e.error_dict:

-                result = serializer.serialize(e.error_dict)
+                result = unicode(serializer.serialize(e.error_dict), 'utf-8')

             else:
                 result = unicode(e) + u'\n'
         except Exception, e:
             else:
                 result = unicode(e) + u'\n'
         except Exception, e: