Author: phd
Date: 2009-05-11 01:03:48 -0600 (Mon, 11 May 2009)
New Revision: 3881
Modified:
SQLObject/trunk/docs/News.txt
SQLObject/trunk/sqlobject/converters.py
SQLObject/trunk/sqlobject/tests/test_converters.py
Log:
Better support for Python 2.6: do not import the deprecated sets module.
Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt 2009-05-11 06:53:04 UTC (rev 3880)
+++ SQLObject/trunk/docs/News.txt 2009-05-11 07:03:48 UTC (rev 3881)
@@ -48,6 +48,11 @@
* Changed the order of testing of SQLite modules - look for external
PySQLite2 before sqlite3.
+SQLObject 0.10.6
+================
+
+* Better support for Python 2.6: do not import the deprecated sets module.
+
SQLObject 0.10.5
================
Modified: SQLObject/trunk/sqlobject/converters.py
===================================================================
--- SQLObject/trunk/sqlobject/converters.py 2009-05-11 06:53:04 UTC (rev 3880)
+++ SQLObject/trunk/sqlobject/converters.py 2009-05-11 07:03:48 UTC (rev 3881)
@@ -1,3 +1,4 @@
+import sys
from array import array
try:
@@ -24,7 +25,6 @@
NumericType = None
from decimal import Decimal
-from sets import Set, ImmutableSet
from types import ClassType, InstanceType, NoneType
########################################
@@ -153,8 +153,10 @@
registerConverter(dict, SequenceConverter)
registerConverter(set, SequenceConverter)
registerConverter(frozenset, SequenceConverter)
-registerConverter(Set, SequenceConverter)
-registerConverter(ImmutableSet, SequenceConverter)
+if sys.version_info[:3] < (2, 6, 0): # Module sets was deprecated in Python 2.6
+ from sets import Set, ImmutableSet
+ registerConverter(Set, SequenceConverter)
+ registerConverter(ImmutableSet, SequenceConverter)
if hasattr(time, 'struct_time'):
def StructTimeConverter(value, db):
Modified: SQLObject/trunk/sqlobject/tests/test_converters.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_converters.py 2009-05-11 06:53:04 UTC (rev 3880)
+++ SQLObject/trunk/sqlobject/tests/test_converters.py 2009-05-11 07:03:48 UTC (rev 3881)
@@ -1,3 +1,4 @@
+import sys
from sqlobject.sqlbuilder import sqlrepr
from sqlobject.sqlbuilder import SQLExpression, SQLObjectField, \
Select, Insert, Update, Delete, Replace, \
@@ -187,9 +188,10 @@
pass
else:
assert sqlrepr(set([1])) == "(1)"
- try:
- from sets import Set
- except ImportError:
- pass
- else:
- assert sqlrepr(Set([1])) == "(1)"
+ if sys.version_info[:3] < (2, 6, 0): # Module sets was deprecated in Python 2.6
+ try:
+ from sets import Set
+ except ImportError:
+ pass
+ else:
+ assert sqlrepr(Set([1])) == "(1)"
|
