fixes for py2.1 (booleans, sigh)

Author: Richard Jones

roundup/backends/back_mysql.py

@@ -522,12 +522,12 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         where = []
         args = []
         a = self.db.arg
-        mlfilt = False
+        mlfilt = 0
         for k, v in filterspec.items():
             propclass = props[k]
             # now do other where clause stuff
             if isinstance(propclass, Multilink):
-                mlfilt = True
+                mlfilt = 1
                 tn = '%s_%s'%(cn, k)
                 if v in ('-1', ['-1']):
                     # only match rows that have count(linkid)=0 in the
@@ -591,20 +591,21 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                         where.append('_%s=%s'%(k, a))
                         args.append(v)
             elif isinstance(propclass, Date):
+                dc = self.db.hyperdb_to_sql_value[hyperdb.Date]
                 if isinstance(v, type([])):
                     s = ','.join([a for x in v])
                     where.append('_%s in (%s)'%(k, s))
-                    args = args + [date.Date(x).serialise() for x in v]
+                    args = args + [dc(date.Date(x)) for x in v]
                 else:
                     try:
                         # Try to filter on range of dates
                         date_rng = Range(v, date.Date, offset=timezone)
-                        if (date_rng.from_value):
+                        if date_rng.from_value:
                             where.append('_%s >= %s'%(k, a))                            
-                            args.append(date_rng.from_value.serialise())
-                        if (date_rng.to_value):
+                            args.append(dc(date_rng.from_value))
+                        if date_rng.to_value:
                             where.append('_%s <= %s'%(k, a))
-                            args.append(date_rng.to_value.serialise())
+                            args.append(dc(date_rng.to_value))
                     except ValueError:
                         # If range creation fails - ignore that search parameter
                         pass                        

roundup/backends/back_postgresql.py

@@ -28,6 +28,9 @@ def db_nuke(config, fail_ok=0):
     command = 'DROP DATABASE %s'% config.POSTGRESQL_DATABASE['database']
     db_command(config, command)
 
+    if os.path.exists(config.DATABASE):
+        shutil.rmtree(config.DATABASE)
+
 def db_command(config, command):
     '''Perform some sort of database-level command. Retry 10 times if we
     fail by conflicting with another user.

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.97 2004-05-04 05:56:48 richard Exp $
+# $Id: rdbms_common.py,v 1.98 2004-05-06 01:12:22 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -2002,12 +2002,12 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         where = []
         args = []
         a = self.db.arg
-        mlfilt = False      # are we joining with Multilink tables?
+        mlfilt = 0      # are we joining with Multilink tables?
         for k, v in filterspec.items():
             propclass = props[k]
             # now do other where clause stuff
             if isinstance(propclass, Multilink):
-                mlfilt = True
+                mlfilt = 1
                 tn = '%s_%s'%(cn, k)
                 if v in ('-1', ['-1']):
                     # only match rows that have count(linkid)=0 in the

roundup/scripts/roundup_mailgw.py

@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup_mailgw.py,v 1.14 2004-04-13 04:14:03 richard Exp $
+# $Id: roundup_mailgw.py,v 1.15 2004-05-06 01:12:24 richard Exp $
 
 """Command-line script stub that calls the roundup.mailgw.
 """
@@ -162,9 +162,9 @@ def main(argv):
             m = re.match(r'((?P<user>[^:]+)(:(?P<pass>.+))?@)?(?P<server>.+)',
                 specification)
             if m:
-                ssl = False
+                ssl = 0
                 if source == 'imaps':
-                    ssl = True
+                    ssl = 1
                 mailbox = ''
                 if len(args) > 3:
                     mailbox = args[3]