Author: cito
Date: Sat Nov 21 11:39:54 2015
New Revision: 573
Log:
Structure tests for bytes/unicode a bit better
Modified:
trunk/module/TEST_PyGreSQL_classic_functions.py
Modified: trunk/module/TEST_PyGreSQL_classic_functions.py
==============================================================================
--- trunk/module/TEST_PyGreSQL_classic_functions.py Sat Nov 21 11:19:59
2015 (r572)
+++ trunk/module/TEST_PyGreSQL_classic_functions.py Sat Nov 21 11:39:54
2015 (r573)
@@ -266,18 +266,17 @@
def testEscapeString(self):
f = pg.escape_string
- r = f('plain')
+ r = f(b'plain')
self.assertIsInstance(r, str)
self.assertEqual(r, 'plain')
- if unicode_strings:
- r = f(b'plain')
- self.assertIsInstance(r, str)
- self.assertEqual(r, 'plain')
- r = f("das is' käse")
+ r = f(u'plain')
+ self.assertIsInstance(r, str)
+ self.assertEqual(r, 'plain')
+ r = f(u"das is' käse".encode('utf-8'))
self.assertIsInstance(r, str)
self.assertEqual(r, "das is'' käse")
if unicode_strings:
- r = f("das is' käse".encode('utf-8'))
+ r = f("das is' käse")
self.assertIsInstance(r, str)
self.assertEqual(r, "das is'' käse")
r = f(r"It's fine to have a \ inside.")
@@ -285,18 +284,17 @@
def testEscapeBytea(self):
f = pg.escape_bytea
- r = f('plain')
+ r = f(b'plain')
self.assertIsInstance(r, str)
self.assertEqual(r, 'plain')
- if unicode_strings:
- r = f(b'plain')
- self.assertIsInstance(r, str)
- self.assertEqual(r, 'plain')
- r = f("das is' käse")
+ r = f(u'plain')
+ self.assertIsInstance(r, str)
+ self.assertEqual(r, 'plain')
+ r = f(u"das is' käse".encode('utf-8'))
self.assertIsInstance(r, str)
self.assertEqual(r, r"das is'' k\\303\\244se")
if unicode_strings:
- r = f("das is' käse".encode('utf-8'))
+ r = f("das is' käse")
self.assertIsInstance(r, str)
self.assertEqual(r, r"das is'' k\\303\\244se")
r = f(b'O\x00ps\xff!')
@@ -304,20 +302,18 @@
def testUnescapeBytea(self):
f = pg.unescape_bytea
- r = f('plain')
+ r = f(b'plain')
self.assertIsInstance(r, str)
self.assertEqual(r, 'plain')
- if unicode_strings:
- r = f(b'plain')
- self.assertIsInstance(r, str)
- self.assertEqual(r, 'plain')
- r = f(r"das is' k\303\244se")
+ r = f(u'plain')
+ self.assertIsInstance(r, str)
+ self.assertEqual(r, 'plain')
+ r = f(b"das is' k\\303\\244se")
+ self.assertIsInstance(r, str)
+ self.assertEqual(r, "das is' käse")
+ r = f(u"das is' k\\303\\244se")
self.assertIsInstance(r, str)
self.assertEqual(r, "das is' käse")
- if unicode_strings:
- r = f(u"das is' k\\303\\244se")
- self.assertIsInstance(r, str)
- self.assertEqual(r, "das is' käse")
r = f(r'O\\000ps\\377!')
self.assertEqual(r, r'O\000ps\377!')
_______________________________________________
PyGreSQL mailing list
[email protected]
https://mail.vex.net/mailman/listinfo.cgi/pygresql
