Thread: [PyWebMail-Checkins] webmail checker.py,1.15,1.16
Status: Beta
Brought to you by:
dubnerm
From: Michael D. <du...@us...> - 2007-12-06 10:12:54
|
Update of /cvsroot/pywebmail/webmail In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28046 Modified Files: checker.py Log Message: misc fixes Index: checker.py =================================================================== RCS file: /cvsroot/pywebmail/webmail/checker.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** checker.py 4 Aug 2007 10:32:22 -0000 1.15 --- checker.py 6 Dec 2007 10:12:44 -0000 1.16 *************** *** 69,77 **** return 'plain' ! def msg_prepare(self, msg): default_compare = 'literal' if self.verify == 'sendmail': default_compare = 'minimal' ! compare = self.config.get('compare', default_compare) return getattr(self, 'msg_prepare_'+compare)(msg) --- 69,91 ---- return 'plain' ! def _get_compare(self): default_compare = 'literal' if self.verify == 'sendmail': default_compare = 'minimal' ! return self.config.get('compare', default_compare) ! ! def msg_compare(self, msg1, msg2): ! compare = self._get_compare() ! if compare == 'least': ! l = min(len(msg1), len(msg2)) ! msg1 = msg1[:l] ! msg2 = msg2[:l] ! return msg1 == msg2 ! ! def msg_prepare(self, msg): ! compare = self._get_compare() ! if compare == 'least': ! #compare = 'minimal' ! compare = 'literal' return getattr(self, 'msg_prepare_'+compare)(msg) *************** *** 101,105 **** head = '' for k in 'from to date subject'.split(): ! v = re.sub('\s+', ' ', msg.get(v)).strip() head += '%s: %s\n' % (k,v) msg.rewindbody() --- 115,119 ---- head = '' for k in 'from to date subject'.split(): ! v = re.sub('\s+', ' ', msg.get(k)).strip() head += '%s: %s\n' % (k,v) msg.rewindbody() *************** *** 266,270 **** custom_mbx += msg2s+'\n' raise ! if msg1x != msg2x: log.warn('%s: message %s: get() != custom_get(%s)', self.name, msginfo.uid, custom) --- 280,284 ---- custom_mbx += msg2s+'\n' raise ! if not self.msg_compare(msg1x, msg2x): log.warn('%s: message %s: get() != custom_get(%s)', self.name, msginfo.uid, custom) *************** *** 310,314 **** else: msg2s = test_mbx1[msginfo.uid] ! if msg1s != msg2s: log.warn('%s: message %s: get(%s) != get(%s)', self.name, msginfo.uid, mailbox_name, mailbox1_name) --- 324,328 ---- else: msg2s = test_mbx1[msginfo.uid] ! if not self.msg_compare(msg1s, msg2s): log.warn('%s: message %s: get(%s) != get(%s)', self.name, msginfo.uid, mailbox_name, mailbox1_name) *************** *** 363,366 **** --- 377,382 ---- msginfo.msghash = hash(self.msg_prepare_literal(msg1)) l.sort(lambda a,b:cmp(a.msghash,b.msghash)) + elif orderby != 'none': + log.warn('Unknown orderby=%s', orderby) for msginfo in l: msg1 = msginfo.get() *************** *** 380,384 **** else: msg2s = test_mbx1[msgno] ! if msg1s != msg2s: dbg1 = repr(msg1s) if len(dbg1) > 30: dbg1 = dbg1[:20]+'...'+dbg1[-10:] --- 396,400 ---- else: msg2s = test_mbx1[msgno] ! if not self.msg_compare(msg1s, msg2s): dbg1 = repr(msg1s) if len(dbg1) > 30: dbg1 = dbg1[:20]+'...'+dbg1[-10:] *************** *** 538,544 **** --- 554,565 ---- if not self.mailbox_settings: self.mailbox_settings = None + if self.max_threads == 1: + global threading + try: import dummy_threading as threading + except ImportError: pass return 1 def get_mailbox_by_name(self, name): + log.debug("get_mailbox_by_name(%s): mailbox_settings=%s", name, self.mailbox_settings) return webmail.settings.MailboxesListSetup.get_mailbox_by_name(self, name, self.mailbox_settings) |