Author: cito
Date: Sun Nov 22 00:01:13 2015
New Revision: 591
Log:
Some more adaptations for Python 3
Modified:
trunk/module/TEST_PyGreSQL_classic_dbwrapper.py
trunk/module/pg.py
Modified: trunk/module/TEST_PyGreSQL_classic_dbwrapper.py
==============================================================================
--- trunk/module/TEST_PyGreSQL_classic_dbwrapper.py Sat Nov 21 23:48:42
2015 (r590)
+++ trunk/module/TEST_PyGreSQL_classic_dbwrapper.py Sun Nov 22 00:01:13
2015 (r591)
@@ -758,7 +758,7 @@
self.assertIn(oid_table, data)
oid = data[oid_table]
self.assertIsInstance(oid, int)
- data = dict(item for item in data.iteritems()
+ data = dict(item for item in data.items()
if item[0] in expect)
ts = expect.get('ts')
if ts == 'current_timestamp':
@@ -777,7 +777,7 @@
data = query(
'select oid,* from "%s"' % table).dictresult()[0]
self.assertEqual(data['oid'], oid)
- data = dict(item for item in data.iteritems()
+ data = dict(item for item in data.items()
if item[0] in expect)
self.assertEqual(data, expect)
query('delete from "%s"' % table)
Modified: trunk/module/pg.py
==============================================================================
--- trunk/module/pg.py Sat Nov 21 23:48:42 2015 (r590)
+++ trunk/module/pg.py Sun Nov 22 00:01:13 2015 (r591)
@@ -28,10 +28,6 @@
# both that copyright notice and this permission notice appear in
# supporting documentation.
-import sys
-if sys.version_info[0] == 3:
- class basestring(str): pass
-
from _pg import *
import select
@@ -40,6 +36,11 @@
from decimal import Decimal
from collections import namedtuple
+try:
+ basestring
+except NameError: # Python >= 3.0
+ basestring = (str, bytes)
+
set_decimal(Decimal)
_______________________________________________
PyGreSQL mailing list
[email protected]
https://mail.vex.net/mailman/listinfo.cgi/pygresql
