MonetDB: default - made everything unicode

[Gijs Molenaar]

Changeset: fb0850ff1062 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb0850ff1062
Modified Files:
        clients/python/monetdb/sql/pythonize.py
        clients/python/test/dbapi20.py
Branch: default
Log Message:

made everything unicode


diffs (43 lines):

diff --git a/clients/python/monetdb/sql/pythonize.py 
b/clients/python/monetdb/sql/pythonize.py
--- a/clients/python/monetdb/sql/pythonize.py
+++ b/clients/python/monetdb/sql/pythonize.py
@@ -28,7 +28,7 @@ from monetdb.exceptions import Programmi
 def strip(data):
     """ returns a python string, with chopped off quotes,
     and replaced escape characters"""
-    return data[1:-1].decode('string_escape')
+    return data[1:-1].decode('string_escape').decode('utf-8')
 
 def py_bool(data):
     """ return python boolean """
diff --git a/clients/python/test/dbapi20.py b/clients/python/test/dbapi20.py
--- a/clients/python/test/dbapi20.py
+++ b/clients/python/test/dbapi20.py
@@ -891,7 +891,8 @@ class DatabaseAPI20Test(unittest.TestCas
             cur.execute('select name from %sbooze' % self.table_prefix)
             res = cur.fetchall()
             beer = res[0][0]
-            self.assertEqual(beer,args['beer'],'incorrect data retrieved')
+            encoded = unicode(args['beer'], 'utf-8')
+            self.assertEqual(beer,encoded,'incorrect data retrieved')
         finally:
             con.close()
 
@@ -902,15 +903,8 @@ class DatabaseAPI20Test(unittest.TestCas
             cur = con.cursor()
             self.executeDDL1(cur)
 
-            # in python 3 everything is unicode
-            import sys
-            major = sys.version_info[0]
-            if major == 3:
-                args = {'beer': '\N{latin small letter a with acute}'}
-                encoded = args['beer']
-            else:
-                args = {'beer': unicode('\N{latin small letter a with acute}', 
'unicode-escape')}
-                encoded = args['beer'].encode('utf-8')
+            args = {'beer': unicode('\N{latin small letter a with acute}', 
'unicode-escape')}
+            encoded = args['beer']
 
             cur.execute( 'insert into %sbooze values (%%(beer)s)' % 
self.table_prefix, args )
             cur.execute('select name from %sbooze' % self.table_prefix)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list