MonetDB: default - Merge with Jan2014 branch.

[Sjoerd Mullender]

Changeset: 1bf15d083580 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1bf15d083580
Modified Files:
        clients/python2/test/test_monetize.py
        clients/python3/test/test_monetize.py
Branch: default
Log Message:

Merge with Jan2014 branch.


diffs (30 lines):

diff --git a/clients/python2/test/test_monetize.py 
b/clients/python2/test/test_monetize.py
--- a/clients/python2/test/test_monetize.py
+++ b/clients/python2/test/test_monetize.py
@@ -25,8 +25,9 @@ class TestMonetize(unittest.TestCase):
         class StrSubClass(str):
             pass
         x = StrSubClass('test')
-        func = convert(x)
-        self.assertEqual(func, monet_escape)
+        csub = convert(x)
+        cstr = convert('test')
+        self.assertEqual(csub, cstr)
 
     def test_unknown_type(self):
         class Unknown:
diff --git a/clients/python3/test/test_monetize.py 
b/clients/python3/test/test_monetize.py
--- a/clients/python3/test/test_monetize.py
+++ b/clients/python3/test/test_monetize.py
@@ -25,8 +25,9 @@ class TestMonetize(unittest.TestCase):
         class StrSubClass(str):
             pass
         x = StrSubClass('test')
-        func = convert(x)
-        self.assertEqual(func, monet_escape)
+        csub = convert(x)
+        cstr = convert('test')
+        self.assertEqual(csub, cstr)
 
     def test_unknown_type(self):
         class Unknown:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list