Author: cito
Date: Sat Nov 21 08:10:58 2015
New Revision: 568
Log:
We can assume namedtuples are always available
Since we require at least Python 2.6 in the trunk,
we don't need to check this any more.
Modified:
trunk/module/TEST_PyGreSQL_classic_connection.py
trunk/module/pg.py
Modified: trunk/module/TEST_PyGreSQL_classic_connection.py
==============================================================================
--- trunk/module/TEST_PyGreSQL_classic_connection.py Sat Nov 21 07:45:26
2015 (r567)
+++ trunk/module/TEST_PyGreSQL_classic_connection.py Sat Nov 21 08:10:58
2015 (r568)
@@ -26,8 +26,6 @@
from decimal import Decimal
-from collections import namedtuple
-
# We need a database to test against. If LOCAL_PyGreSQL.py exists we will
# get our information from that. Otherwise we use the defaults.
dbname = 'unittest'
@@ -292,7 +290,6 @@
self.assertIsInstance(v, str)
self.assertEqual(v, result)
- @unittest.skipUnless(namedtuple, 'Named tuples not available')
def testNamedresult(self):
q = "select 0 as alias0"
result = [(0,)]
@@ -314,7 +311,6 @@
r = self.c.query(q).dictresult()
self.assertEqual(r, result)
- @unittest.skipUnless(namedtuple, 'Named tuples not available')
def testGet3NamedCols(self):
q = "select 1 as a,2 as b,3 as c"
result = [(1, 2, 3)]
@@ -337,7 +333,6 @@
r = self.c.query(q).dictresult()
self.assertEqual(r, result)
- @unittest.skipUnless(namedtuple, 'Named tuples not available')
def testGet3NamedRows(self):
q = ("select 3 as alias3"
" union select 1 union select 2 order by 1")
@@ -357,7 +352,6 @@
r = self.c.query(q).dictresult()
self.assertEqual(r, result)
- @unittest.skipUnless(namedtuple, 'Named tuples not available')
def testNamedresultNames(self):
q = "select 'MixedCase' as MixedCaseAlias"
result = [('MixedCase',)]
@@ -953,7 +947,6 @@
self.assertEqual(r, 3425L)
pg.set_decimal(d)
- @unittest.skipUnless(namedtuple, 'Named tuples not available')
def testSetNamedresult(self):
query = self.c.query
Modified: trunk/module/pg.py
==============================================================================
--- trunk/module/pg.py Sat Nov 21 07:45:26 2015 (r567)
+++ trunk/module/pg.py Sat Nov 21 08:10:58 2015 (r568)
@@ -109,14 +109,12 @@
return 'oid(%s)' % qcl
-if namedtuple:
+def _namedresult(q):
+ """Get query result as named tuples."""
+ row = namedtuple('Row', q.listfields())
+ return [row(*r) for r in q.getresult()]
- def _namedresult(q):
- """Get query result as named tuples."""
- row = namedtuple('Row', q.listfields())
- return [row(*r) for r in q.getresult()]
-
- set_namedresult(_namedresult)
+set_namedresult(_namedresult)
def _db_error(msg, cls=DatabaseError):
_______________________________________________
PyGreSQL mailing list
[email protected]
https://mail.vex.net/mailman/listinfo.cgi/pygresql
