Author: cito
Date: Tue Jan 12 21:00:04 2016
New Revision: 731
Log:
Back ported some minor fixes from trunk to 4.x
Modified:
branches/4.x/tests/test_classic.py
branches/4.x/tests/test_classic_connection.py
branches/4.x/tests/test_classic_dbwrapper.py
Modified: branches/4.x/tests/test_classic.py
==============================================================================
--- branches/4.x/tests/test_classic.py Tue Jan 12 20:58:54 2016 (r730)
+++ branches/4.x/tests/test_classic.py Tue Jan 12 21:00:04 2016 (r731)
@@ -181,6 +181,7 @@
self.assertEqual(r['dvar'], 123)
r = db.get('_test_schema', 1234)
+ self.assertIn('dvar', r)
db.update('_test_schema', _test=1234, dvar=456)
r = db.get('_test_schema', 1234)
self.assertEqual(r['dvar'], 456)
Modified: branches/4.x/tests/test_classic_connection.py
==============================================================================
--- branches/4.x/tests/test_classic_connection.py Tue Jan 12 20:58:54
2016 (r730)
+++ branches/4.x/tests/test_classic_connection.py Tue Jan 12 21:00:04
2016 (r731)
@@ -998,7 +998,7 @@
en_locales = 'en', 'en_US', 'en_US.utf8', 'en_US.UTF-8'
en_money = '$34.25', '$ 34.25', '34.25$', '34.25 $', '34.25 Dollar'
de_locales = 'de', 'de_DE', 'de_DE.utf8', 'de_DE.UTF-8'
- de_money = ('34,25€', '34,25 €', '€34,25' '€ 34,25',
+ de_money = ('34,25€', '34,25 €', '€34,25', '€ 34,25',
'EUR34,25', 'EUR 34,25', '34,25 EUR', '34,25 Euro', '34,25 DM')
# first try with English localization (using the point)
for lc in en_locales:
Modified: branches/4.x/tests/test_classic_dbwrapper.py
==============================================================================
--- branches/4.x/tests/test_classic_dbwrapper.py Tue Jan 12 20:58:54
2016 (r730)
+++ branches/4.x/tests/test_classic_dbwrapper.py Tue Jan 12 21:00:04
2016 (r731)
@@ -790,7 +790,7 @@
data, change = test
expect = data.copy()
expect.update(change)
- if data.get('m') and server_version < 910000:
+ if data.get('m') and server_version < 90100:
# PostgreSQL < 9.1 cannot directly convert numbers to money
data['m'] = "'%s'::money" % data['m']
self.assertEqual(insert(table, data), data)
_______________________________________________
PyGreSQL mailing list
[email protected]
https://mail.vex.net/mailman/listinfo.cgi/pygresql
