Thread: [SQL-CVS] r4726 - in SQLObject/branches/1.7: docs sqlobject sqlobject/tests
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2014-05-05 18:37:43
|
Author: phd Date: Mon May 5 12:37:35 2014 New Revision: 4726 Log: Stop supporting Python 2.5: remove import sets Modified: SQLObject/branches/1.7/docs/News.txt SQLObject/branches/1.7/docs/TODO.txt SQLObject/branches/1.7/sqlobject/converters.py SQLObject/branches/1.7/sqlobject/tests/test_converters.py Modified: SQLObject/branches/1.7/docs/News.txt ============================================================================== --- SQLObject/branches/1.7/docs/News.txt Mon May 5 12:30:12 2014 (r4725) +++ SQLObject/branches/1.7/docs/News.txt Mon May 5 12:37:35 2014 (r4726) @@ -13,6 +13,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/branches/1.7/docs/TODO.txt ============================================================================== --- SQLObject/branches/1.7/docs/TODO.txt Mon May 5 12:30:12 2014 (r4725) +++ SQLObject/branches/1.7/docs/TODO.txt Mon May 5 12:37:35 2014 (r4726) @@ -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: use ``with lock``; make ConnectionHub a context manager instead of .doInTransaction(); replace time.strptime with datetime.strptime. Upgrade ez_setup to 2.0+. Modified: SQLObject/branches/1.7/sqlobject/converters.py ============================================================================== --- SQLObject/branches/1.7/sqlobject/converters.py Mon May 5 12:30:12 2014 (r4725) +++ SQLObject/branches/1.7/sqlobject/converters.py Mon May 5 12:37:35 2014 (r4726) @@ -155,10 +155,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/branches/1.7/sqlobject/tests/test_converters.py ============================================================================== --- SQLObject/branches/1.7/sqlobject/tests/test_converters.py Mon May 5 12:30:12 2014 (r4725) +++ SQLObject/branches/1.7/sqlobject/tests/test_converters.py Mon May 5 12:37:35 2014 (r4726) @@ -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)) == \ |