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

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

Author: phd
Date: 2005-01-15 14:25:16 +0000 (Sat, 15 Jan 2005)
New Revision: 549

Modified:
   trunk/SQLObject/sqlobject/col.py
   trunk/SQLObject/tests/test_sqlobject.py
Log:
Fixed more incompatibility with Python 2.2: use string.find(),
emulate sum() and enumerate() if they aren't available.


Modified: trunk/SQLObject/sqlobject/col.py
===================================================================
--- trunk/SQLObject/sqlobject/col.py	2005-01-15 13:21:28 UTC (rev 548)
+++ trunk/SQLObject/sqlobject/col.py	2005-01-15 14:25:16 UTC (rev 549)
@@ -732,7 +732,7 @@
                 return value
             if mxdatetime_available and isinstance(value, DateTimeType):
                 # convert mxDateTime instance to datetime
-                if ("%H" in self.format) or ("%T" in self.format):
+                if (self.format.find("%H") >= 0) or (self.format.find("%T")) >= 0:
                     return datetime.datetime(value.year, value.month, value.day,
                         value.hour, value.minute, int(value.second))
                 else:

Modified: trunk/SQLObject/tests/test_sqlobject.py
===================================================================
--- trunk/SQLObject/tests/test_sqlobject.py	2005-01-15 13:21:28 UTC (rev 548)
+++ trunk/SQLObject/tests/test_sqlobject.py	2005-01-15 14:25:16 UTC (rev 549)
@@ -341,6 +341,14 @@
 ########################################
 ## Select results
 ########################################
+try:
+    enumerate
+except NameError:
+    def enumerate(iterable):
+        i = 0
+        for obj in iterable:
+            yield i, obj
+            i += 1
 
 class IterTest(SQLObject):
     name = StringCol(dbName='name_col')
@@ -369,11 +377,6 @@
         self.failIf(count != len(self.names))
 
     def test_02_generator(self):
-        def enumerate(iterable):
-            i = 0
-            for obj in iterable:
-                yield i, obj
-                i += 1
         all = IterTest.select()
         count = 0
         for i, test in enumerate(all):
@@ -579,6 +582,14 @@
         self.assertEqual(func([ c.n1 for c in counters]), value)
 
     def test1(self):
+        try:
+            sum
+        except NameError:
+            def sum(sequence):
+                s = 0
+                for item in sequence:
+                    s = s + item
+                return s
         self.accumulateEqual(sum,Counter2.select(orderBy='n1'),
                              sum(range(10)) * 10)