Author: phd
Date: 2009-05-11 00:53:04 -0600 (Mon, 11 May 2009)
New Revision: 3880
Modified:
SQLObject/branches/0.10/docs/News.txt
SQLObject/branches/0.10/sqlobject/converters.py
SQLObject/branches/0.10/sqlobject/tests/test_converters.py
Log:
Better support for Python 2.6: do not import the deprecated sets module.
Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt 2009-05-06 12:14:03 UTC (rev 3879)
+++ SQLObject/branches/0.10/docs/News.txt 2009-05-11 06:53:04 UTC (rev 3880)
@@ -7,6 +7,11 @@
.. _start:
+SQLObject 0.10.6
+================
+
+* Better support for Python 2.6: do not import the deprecated sets module.
+
SQLObject 0.10.5
================
Modified: SQLObject/branches/0.10/sqlobject/converters.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/converters.py 2009-05-06 12:14:03 UTC (rev 3879)
+++ SQLObject/branches/0.10/sqlobject/converters.py 2009-05-11 06:53:04 UTC (rev 3880)
@@ -1,3 +1,4 @@
+import sys
from array import array
try:
@@ -161,13 +162,14 @@
else:
registerConverter(set, SequenceConverter)
registerConverter(frozenset, SequenceConverter)
-try:
- from sets import Set, ImmutableSet
-except ImportError:
- pass
-else:
- registerConverter(Set, SequenceConverter)
- registerConverter(ImmutableSet, SequenceConverter)
+if sys.version_info[:3] < (2, 6, 0): # Module sets was deprecated in Python 2.6
+ try:
+ from sets import Set, ImmutableSet
+ except ImportError:
+ pass
+ else:
+ registerConverter(Set, SequenceConverter)
+ registerConverter(ImmutableSet, SequenceConverter)
if hasattr(time, 'struct_time'):
def StructTimeConverter(value, db):
Modified: SQLObject/branches/0.10/sqlobject/tests/test_converters.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/tests/test_converters.py 2009-05-06 12:14:03 UTC (rev 3879)
+++ SQLObject/branches/0.10/sqlobject/tests/test_converters.py 2009-05-11 06:53:04 UTC (rev 3880)
@@ -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)"
|
