merge from maint-0-7

Author: Richard Jones

CHANGES.txt

@@ -22,6 +22,7 @@ Feature:
 Fixed:
 - ZRoundup's search interface works now (sf bug 994957)
 - fixed history display when "ascending"
+- removed references to py2.3+ boolean values (sf bug 995682)
 
 
 2004-07-21 0.7.6

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.165 2004-07-21 01:01:44 richard Exp $
+#$Id: back_anydbm.py,v 1.166 2004-07-22 04:47:35 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -1653,7 +1653,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     # get the node value
                     nv = node.get(k, None)
 
-                    match = False
+                    match = 0
 
                     # now apply the property filter
                     if t == LINK:
@@ -1674,7 +1674,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                             # required values
                             for want in v:
                                 if want in nv:
-                                    match = True
+                                    match = 1
                                     break
                     elif t == STRING:
                         if nv is None:
@@ -1687,10 +1687,10 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                         else:
                             if v.to_value:
                                 if v.from_value <= nv and v.to_value >= nv:
-                                    match = True
+                                    match = 1
                             else:
                                 if v.from_value <= nv:
-                                    match = True
+                                    match = 1
                     elif t == OTHER:
                         # straight value comparison for the other types
                         match = nv in v

roundup/backends/back_mysql.py

@@ -242,7 +242,7 @@ def add_new_columns_v2(self):
             olddata = []
             propnames = propnames + ['id', '__retired__']
             cols = []
-            first = True
+            first = 1
             for entry in self.cursor.fetchall():
                 l = []
                 olddata.append(l)
@@ -284,7 +284,7 @@ def add_new_columns_v2(self):
                             l.append(v.as_seconds())
                         else:
                             l.append(e)
-                first = False
+                first = 0
 
             self.drop_class_table_indexes(cn, old_spec[0])