[Hepserver-commits] messaging/messaging message.py,1.2,1.3 __init__.py,1.13,1.14

[<abe...@us...>]

Update of /cvsroot/hepserver//messaging/messaging
In directory sc8-pr-cvs1:/tmp/cvs-serv17863/messaging

Modified Files:
	message.py __init__.py 
Log Message:
bug fixes, some small improvements to support IMAP.

Index: message.py
===================================================================
RCS file: /cvsroot/hepserver//messaging/messaging/message.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** message.py	7 Aug 2003 03:32:28 -0000	1.2
--- message.py	12 Aug 2003 17:50:39 -0000	1.3
***************
*** 45,56 ****
          
      def updateParent(self):
!         if self._parent and self._name: self._parent[self._name] = self.getValue()
          
      def __str__(self):
          return str(self._value)
          
-     def __repr__(self):
-         return self._value
-         
      def __len__(self):
          return len(self._value)
--- 45,54 ----
          
      def updateParent(self):
!         if self._parent and self._name:    
!             self._parent[self._name] = self.getValue()
          
      def __str__(self):
          return str(self._value)
          
      def __len__(self):
          return len(self._value)
***************
*** 128,132 ****
  
          if self._attributeProxies.has_key(headerName):
!             return self._attributeProxies[headerName](self._message[headerName], key, self)
          else:
              return self._message.get(key)
--- 126,130 ----
  
          if self._attributeProxies.has_key(headerName):
!             return self._attributeProxies[headerName](self._message[headerName], headerName, self)
          else:
              return self._message.get(key)

Index: __init__.py
===================================================================
RCS file: /cvsroot/hepserver//messaging/messaging/__init__.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** __init__.py	9 Jul 2003 16:15:23 -0000	1.13
--- __init__.py	12 Aug 2003 17:50:39 -0000	1.14
***************
*** 6,9 ****
--- 6,10 ----
  from urllib import quote_plus as quote
  import time
+ from email.Utils import parsedate, parsedate_tz, mktime_tz
  
  log = sys.stdout
***************
*** 11,14 ****
--- 12,18 ----
  VERSION = '0.0.3'
  
+ def parseDate(rfcDate):
+     return time.localtime(mktime_tz(parsedate_tz(rfcDate)))
+ 
  class MessageStore(object):
      
***************
*** 40,44 ****
          
      def getMessage(self, messageID):
!         return self.messages[int(messageID)]
          
      def editMessage(self, messageID, newMessage):
--- 44,48 ----
          
      def getMessage(self, messageID):
!         return defer.succeed(self.messages[int(messageID)])
          
      def editMessage(self, messageID, newMessage):
***************
*** 48,51 ****
--- 52,61 ----
          del self.messages[int(messageID)]
          
+     def getCount(self):
+         "override with a more-efficient implementation if desired."
+         d = self.listMessages()
+         d.addCallback(lambda messages: len(messages))
+         return d
+         
      def listWithHeaders(self):
          """
***************
*** 69,73 ****
      def _gotMessageForHeaders(self, message, messageid, messageCount, deferred, headers):
          # fixme: pull all headers from message
!         headers[messageid] = {"author": message.author, "title": message.title, "id":message.guid, "timestamp":message.timestamp}
          if len(headers) == messageCount:
              deferred.callback(headers)
--- 79,83 ----
      def _gotMessageForHeaders(self, message, messageid, messageCount, deferred, headers):
          # fixme: pull all headers from message
!         headers[messageid] = message.getAllHeaders()
          if len(headers) == messageCount:
              deferred.callback(headers)