[SQL-CVS] r4731 - in SQLObject/trunk: docs sqlobject sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Fri May  9 11:47:30 2014
New Revision: 4731

Log:
Merge revisions 4726:4730 from branch 1.7: stop supporting Python 2.5

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/docs/SQLObject.txt
   SQLObject/trunk/docs/TODO.txt
   SQLObject/trunk/sqlobject/converters.py
   SQLObject/trunk/sqlobject/main.py
   SQLObject/trunk/sqlobject/tests/test_converters.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Fri May  9 11:32:55 2014	(r4730)
+++ SQLObject/trunk/docs/News.txt	Fri May  9 11:47:30 2014	(r4731)
@@ -25,6 +25,9 @@
 Features & Interface
 --------------------
 
+* Python 2.5 is no longer supported. The minimal supported version is
+  Python 2.6.
+
 * DateTimeCol and TimeCol can read values with microseconds (created by
   SQLObject 2.0) but do not write microseconds back.
 

Modified: SQLObject/trunk/docs/SQLObject.txt
==============================================================================
--- SQLObject/trunk/docs/SQLObject.txt	Fri May  9 11:32:55 2014	(r4730)
+++ SQLObject/trunk/docs/SQLObject.txt	Fri May  9 11:47:30 2014	(r4731)
@@ -66,7 +66,7 @@
 .. _FreeTDS: http://www.freetds.org/
 .. _ADODBAPI: http://adodbapi.sourceforge.net/
 
-Python 2.3 or higher is required.  SQLObject makes extensive use of
+Python 2.6 or higher is required.  SQLObject makes extensive use of
 new-style classes.
 
 Compared To Other Database Wrappers

Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt	Fri May  9 11:32:55 2014	(r4730)
+++ SQLObject/trunk/docs/TODO.txt	Fri May  9 11:47:30 2014	(r4731)
@@ -45,7 +45,7 @@
 
 * Cache columns in sqlmeta.getColumns(); reset the cache on add/del Column/Join.
 
-* Stop supporting Python 2.5: remove import sets; use ``with lock``;
+* Stop supporting Python 2.5:
   make ConnectionHub a context manager instead of .doInTransaction();
   replace time.strptime with datetime.strptime. Upgrade ez_setup to 2.0+.
 

Modified: SQLObject/trunk/sqlobject/converters.py
==============================================================================
--- SQLObject/trunk/sqlobject/converters.py	Fri May  9 11:32:55 2014	(r4730)
+++ SQLObject/trunk/sqlobject/converters.py	Fri May  9 11:47:30 2014	(r4731)
@@ -139,10 +139,6 @@
 registerConverter(dict, SequenceConverter)
 registerConverter(set, SequenceConverter)
 registerConverter(frozenset, 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/main.py
==============================================================================
--- SQLObject/trunk/sqlobject/main.py	Fri May  9 11:32:55 2014	(r4730)
+++ SQLObject/trunk/sqlobject/main.py	Fri May  9 11:47:30 2014	(r4731)
@@ -43,8 +43,8 @@
 from util.threadinglocal import local
 
 import sys
-if sys.version_info[:3] < (2, 5, 0):
-    raise ImportError, "SQLObject requires Python 2.5.0 or later"
+if sys.version_info[:3] < (2, 6, 0):
+    raise ImportError, "SQLObject requires Python 2.6.0 or later"
 
 """
 This thread-local storage is needed for RowCreatedSignals. It gathers

Modified: SQLObject/trunk/sqlobject/tests/test_converters.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_converters.py	Fri May  9 11:32:55 2014	(r4730)
+++ SQLObject/trunk/sqlobject/tests/test_converters.py	Fri May  9 11:47:30 2014	(r4731)
@@ -191,13 +191,6 @@
         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)"
 
 def test_timedelta():
     assert sqlrepr(timedelta(seconds=30*60)) == \