Author: cito
Date: Sun Nov 22 11:26:34 2015
New Revision: 603
Log:
unescape_bytea() is actually stateless
Contrary to escape_bytea() and escape_string(), the unescape_bytea()
function does not depend on the connection. So we can leave the test
for unescape_bytea() in the module running without database.
Modified:
trunk/module/TEST_PyGreSQL_classic_connection.py
trunk/module/TEST_PyGreSQL_classic_functions.py
Modified: trunk/module/TEST_PyGreSQL_classic_connection.py
==============================================================================
--- trunk/module/TEST_PyGreSQL_classic_connection.py Sun Nov 22 11:12:29
2015 (r602)
+++ trunk/module/TEST_PyGreSQL_classic_connection.py Sun Nov 22 11:26:34
2015 (r603)
@@ -1073,7 +1073,7 @@
class TestStandaloneEscapeFunctions(unittest.TestCase):
- """"Test pg escape and unescape functions.
+ """"Test pg escape functions.
The libpq interface memorizes some parameters of the last opened
connection that influence the result of these functions. Therefore
@@ -1126,23 +1126,6 @@
r = f(b'O\x00ps\xff!')
self.assertEqual(r, r'O\\000ps\\377!')
- def testUnescapeBytea(self):
- f = pg.unescape_bytea
- r = f(b'plain')
- self.assertIsInstance(r, str)
- self.assertEqual(r, 'plain')
- 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")
- r = f(r'O\\000ps\\377!')
- self.assertEqual(r, r'O\000ps\377!')
-
if __name__ == '__main__':
unittest.main()
Modified: trunk/module/TEST_PyGreSQL_classic_functions.py
==============================================================================
--- trunk/module/TEST_PyGreSQL_classic_functions.py Sun Nov 22 11:12:29
2015 (r602)
+++ trunk/module/TEST_PyGreSQL_classic_functions.py Sun Nov 22 11:26:34
2015 (r603)
@@ -303,9 +303,14 @@
r = f(u'plain')
self.assertIsInstance(r, str)
self.assertEqual(r, 'plain')
- r = f("that's cheese")
+ r = f(b"das is' k\\303\\244se")
self.assertIsInstance(r, str)
- self.assertEqual(r, "that's cheese")
+ 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")
+ r = f(r'O\\000ps\\377!')
+ self.assertEqual(r, r'O\000ps\377!')
class TestConfigFunctions(unittest.TestCase):
_______________________________________________
PyGreSQL mailing list
[email protected]
https://mail.vex.net/mailman/listinfo.cgi/pygresql
