mailmanager migration.py,1.1.2.11,1.1.2.12

[Andrew V. <av...@us...>]

Update of /cvsroot/mailmanager/mailmanager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4939

Modified Files:
      Tag: db-backend
	migration.py 
Log Message:
Booleans can go straight into ZSQL without a str(). Makes the code a bit neater.


Index: migration.py
===================================================================
RCS file: /cvsroot/mailmanager/mailmanager/Attic/migration.py,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -d -r1.1.2.11 -r1.1.2.12
--- migration.py	14 Apr 2005 16:04:25 -0000	1.1.2.11
+++ migration.py	15 Apr 2005 14:51:13 -0000	1.1.2.12
@@ -71,7 +71,7 @@
         self.sql.addAccount(email=self.toUnicode(account.title),
                             assign_user=self.toUnicode(account.assign_user or ''),
                             assign_group=self.toUnicode(account.assign_group or ''),
-                            notify_user=str(bool(account.notify_agent)),
+                            notify_user=not not account.notify_agent,
                             mail_server=account.mail_server,
                             mail_username=self.toUnicode(account.mail_username),
                             mail_password=self.toUnicode(account.mail_password),
@@ -81,12 +81,12 @@
                             default_category1=self.toUnicode(account.default_category1 or ''),
                             default_category2=self.toUnicode(account.default_category2 or ''),
                             response_target=response_target,
-                            auto_reply=str(not not account.auto_reply),
+                            auto_reply=not not account.auto_reply,
                             reply_text=self.toUnicode(account.reply_text),
-                            html_reply=str(not not account.html_reply),
-                            signature=str(not not account.signature),
+                            html_reply=not not account.html_reply,
+                            signature=not not account.signature,
                             signature_text=self.toUnicode(account.signature_text),
-                            html_signature=str(not not account.html_signature))
+                            html_signature=not not account.html_signature)
         # And the tickets for each account
         for ticket in account.objectValues():
             zLOG.LOG(subsystem='MailManager',
@@ -106,7 +106,7 @@
                                category0=self.toUnicode(ticket.category0 or ''),
                                category1=self.toUnicode(ticket.category1 or ''),
                                category2=self.toUnicode(ticket.category2 or ''),
-                               unread=str(bool(ticket.unread)))
+                               unread=not not ticket.unread)
             # Now messages in each ticket
             for message in ticket.objectValues():
                 id = self.sql.getNextMessageId()[0].id