offlineimap rev 558

You are receiving this message because
all commits get sent to this address.

Author: jgoerzen
Date: 2003-08-12 15:22:42 -0500 (Tue, 12 Aug 2003)
New Revision: 558

Modified:
  offlineimap/branches/twisted/offlineimap/folder/Base.py
  offlineimap/branches/twisted/offlineimap/folder/IMAP.py
  offlineimap/branches/twisted/offlineimap/imapserver.py

Log:
Removed/fixed up some debugging


Diff:
Modified: offlineimap/branches/twisted/offlineimap/folder/Base.py
===================================================================
--- offlineimap/branches/twisted/offlineimap/folder/Base.py	2003-08-12 20:09:10 UTC (rev 557)
+++ offlineimap/branches/twisted/offlineimap/folder/Base.py	2003-08-12 20:22:42 UTC (rev 558)
@@ -251,18 +251,18 @@
     def syncmessagesto_neguid_msg_tryappend(self, successuid, lasttry,
                                         trylist, flags,
                                         message, uid, dest, applyto, register):
-        print "This is syncmessagesto tryappend."
-        print "successuid", successuid
-        print "lasttry", lasttry
-        print "trylist", trylist
+        #print "This is syncmessagesto tryappend."
+        #print "successuid", successuid
+        #print "lasttry", lasttry
+        #print "trylist", trylist
         
         if successuid > 0:
             # Last server took this message.  Proceed.
-            print "Chaining to realappend."
+            #print "Chaining to realappend."
             return self.syncmessagesto_neguid_msg_realappend(successuid, lasttry,
                                              flags, message, uid, dest, applyto, register)
         if not len(trylist):
-            print "Returning nonde."
+            #print "Returning none."
             # Did not find any server to take thie message.  Ignore.
             return rd(None)
 
@@ -275,7 +275,7 @@
         d.addCallback(self.syncmessagesto_neguid_msg_tryappend,
                       tryappend, trylist, flags, message, uid, dest,
                       applyto, register)
-        print "Chaining to savemessage and myself."
+        #print "Chaining to savemessage and myself."
         return d
 
 
@@ -311,7 +311,7 @@
         add it to local for real, and delete the fake one.
 
         Returns Deferred."""
-        print "syncmessagesto_neguid"
+        #print "syncmessagesto_neguid"
 
         # FIXME: this used to be thread aware.
         # Not sure what to do now.
@@ -330,11 +330,11 @@
         # synced to the status cache.  This is only a problem with
         # self.getmessage().  So, don't call self.getmessage unless
         # really needed.
-        print "This is copymessageto."
+        #print "This is copymessageto."
         if register:
             UIBase.getglobalui().registerthread(self.getaccountname())
-        print uid
-        print type(uid)
+        #print uid
+        #print type(uid)
         flags = self.getmessageflags(uid)
         UIBase.getglobalui().copyingmessage(uid, self, applyto)
         message = ''
@@ -348,7 +348,7 @@
         return self.copymessageto_worker('', uid, applyto, flags)
 
     def copymessageto_worker(self, message, uid, applyto, flags):
-        print "This is copymessageto_worker for", uid
+        #print "This is copymessageto_worker for", uid
         if len(applyto) == 0:
             return
 
@@ -359,7 +359,7 @@
         return d
 
     def copymessageto_saveuid(self, newuid, message, uid, applyto, flags):
-        print "This is copymessageto_saveuid for", uid
+        #print "This is copymessageto_saveuid for", uid
         if newuid > 0 and newuid != uid:
             # Change the local uid.
             d = self.savemessage(newuid, message, flags)
@@ -380,7 +380,7 @@
         them to dest.
 
         Returns Deferred."""
-        print "syncmessagesto_copy"
+        #print "syncmessagesto_copy"
         deferreds = []
         
         for uid in self.getmessagelist().keys():
@@ -398,7 +398,7 @@
         If any, delete them.
 
         Returns a deferred"""
-        print "syncmessagesto_delete"
+        #print "syncmessagesto_delete"
         deletelist = []
         for uid in dest.getmessagelist().keys():
             if uid < 0:
@@ -420,7 +420,7 @@
         same flags that we have.
 
         Returns a Deferred."""
-        print "syncmessagesto_flags"
+        #print "syncmessagesto_flags"
         # As an optimization over previous versions, we store up which flags
         # are being used for an add or a delete.  For each flag, we store
         # a list of uids to which it should be added.  Then, we can call
@@ -473,7 +473,7 @@
         applyto ones should be the ones that "copy" the main action.
 
         Returns Deferred."""
-        print "****************This is syncmessagesto:", self.getname()
+        #print "****************This is syncmessagesto:", self.getname()
 
         if applyto == None:
             applyto = [dest]

Modified: offlineimap/branches/twisted/offlineimap/folder/IMAP.py
===================================================================
--- offlineimap/branches/twisted/offlineimap/folder/IMAP.py	2003-08-12 20:09:10 UTC (rev 557)
+++ offlineimap/branches/twisted/offlineimap/folder/IMAP.py	2003-08-12 20:22:42 UTC (rev 558)
@@ -107,7 +107,6 @@
             uid = long(uids[msg]['UID'])
             self.messagelist[uid] = {'uid': uid, 'flags': flags}
 
-        print self.getname(), "Cached at", self.messagelist
         maindefer.callback(None)
 
     def getmessagelist(self):
@@ -197,7 +196,6 @@
 
     def _savemessage_acquired(self, imapobj, uid, content, flags):
         ui = UIBase.getglobalui()
-        print "savemessage_acquired called"
         ui.debug('imap', 'savemessage_step1: called')
         d = imapobj.select(self.getfullname())
         d.addCallback(self._savemessage_step2, imapobj, uid, content, flags)
@@ -206,7 +204,6 @@
     def _savemessage_step2(self, ignore, imapobj, uid, content, flags):
         # This backend always assigns a new uid, so the uid arg is ignored.
         # In order to get the new uid, we need to save off the message ID.
-        print "savemessage_step2 called"
         ui = UIBase.getglobalui()
         message = rfc822.Message(StringIO(content))
         datetuple = rfc822.parsedate(message.getheader('Date'))
@@ -249,7 +246,6 @@
 
     def savemessage_fetchuid(self, ignore, imapobj, headername, headervalue,
                              flags, previousattempts):
-        print "This is savemessage_fetchuid"
         ui = UIBase.getglobalui()
         ui.debug('imap', 'savemessage: attempt %d to get new UID' \
                  % previousattempts)
@@ -266,7 +262,6 @@
 
     def savemessage_tryregister(self, uid, imapobj, headername, headervalue,
                                 flags, previousattempts):
-        print "This is savemessage_tryregister"
         if not uid:
             d = imapobj.noop()
             d.addCallback(self.savemessage_fetchuid, imapobj, headername,
@@ -278,8 +273,6 @@
 
     def savemessage_register(self, ignore, uid, flags):
         ui = UIBase.getglobalui()
-        print "This is savemessage_register"
-        #self.imapserver.releaseconnection(imapobj)
         self.messagelist[uid] = {'uid': uid, 'flags': flags}
         ui.debug('imap', 'savemessage: returning %d' % uid)
         return uid
@@ -296,7 +289,6 @@
                                 uid = 1)
 
     def savemessageflags_store(self, result, uid, flags):
-        print "savemessageflags_store: result =", result
         result = result[1][0]
         if not result:
             self.messagelist[uid]['flags'] = flags

Modified: offlineimap/branches/twisted/offlineimap/imapserver.py
===================================================================
--- offlineimap/branches/twisted/offlineimap/imapserver.py	2003-08-12 20:09:10 UTC (rev 557)
+++ offlineimap/branches/twisted/offlineimap/imapserver.py	2003-08-12 20:22:42 UTC (rev 558)
@@ -27,10 +27,15 @@
 
 class MyIMAP(IMAP4Client):
     def connectionMade(self):
-        print "Connectionmade."
+        #print "Connectionmade."
         self.factory.imapserver.connectionMade(self)
 
+    def sendLine(self, line):
+        ui = UIBase.getglobalui()
+        ui.debug('imap', 'Send: ', str(line))
+        return IMAP4Client.sendLine(self, line)
 
+
 class IMAPClientFactory(protocol.ClientFactory):
     protocol = MyIMAP
     def __init__(self, imapserver):