# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1407943837 -7200
# Node ID 232002e132dbf9c7563d9f78f4b5e2bcdc2764de
# Parent  f17034e4cf4afc5344536094017aae54d83df2cf
pgsql_backend unicode fix: parseXml was expecting str and getting unicode

diff -r f17034e4cf4a -r 232002e132db sat_pubsub/pgsql_storage.py
--- a/sat_pubsub/pgsql_storage.py	Wed Aug 13 17:01:29 2014 +0200
+++ b/sat_pubsub/pgsql_storage.py	Wed Aug 13 17:30:37 2014 +0200
@@ -59,15 +59,19 @@
 from twisted.internet import defer
 from twisted.words.protocols.jabber import jid
 
-from wokkel.generic import parseXml, stripNamespace
+from wokkel import generic
 from wokkel.pubsub import Subscription
 
 from sat_pubsub import error, iidavoll, const
 import psycopg2
 import psycopg2.extensions
+# we wants psycopg2 to return us unicode, not str
 psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
 psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY)
 
+# parseXml manage str, but we get unicode
+parseXml = lambda unicode_data: generic.parseXml(unicode_data.encode('utf-8'))
+
 class Storage:
 
     implements(iidavoll.IStorage)
@@ -643,7 +647,7 @@
         if unrestricted:
             ret = []
             for data in result:
-                item = stripNamespace(parseXml(data[0]))
+                item = generic.stripNamespace(parseXml(data[0]))
                 access_model = data[1]
                 item_id = data[2]
                 if access_model == 'roster': #TODO: jid access_model
@@ -654,7 +658,7 @@
 
                 ret.append((item, access_model, access_list))
             return ret
-        items = [stripNamespace(parseXml(r[0])) for r in result]
+        items = [generic.stripNamespace(parseXml(r[0])) for r in result]
         return items
 
 
@@ -681,7 +685,7 @@
                 result = cursor.fetchone()
                 if result:
                     for data in result:
-                        item = stripNamespace(parseXml(data[0]))
+                        item = generic.stripNamespace(parseXml(data[0]))
                         access_model = data[1]
                         item_id = data[2]
                         if access_model == 'roster': #TODO: jid access_model