[CalendarServer-changes] [4139] CalendarServer/trunk/lib-patches/vobject/vobject.base.patch

[source_changes at macosforge.org]

Revision: 4139
          http://trac.macosforge.org/projects/calendarserver/changeset/4139
Author:   sagen at apple.com
Date:     2009-05-02 08:45:33 -0700 (Sat, 02 May 2009)
Log Message:
-----------
BaseException.message is deprecated in Python 2.6.  Renaming to msg.

Modified Paths:
--------------
    CalendarServer/trunk/lib-patches/vobject/vobject.base.patch

Modified: CalendarServer/trunk/lib-patches/vobject/vobject.base.patch
===================================================================
--- CalendarServer/trunk/lib-patches/vobject/vobject.base.patch	2009-05-02 00:23:33 UTC (rev 4138)
+++ CalendarServer/trunk/lib-patches/vobject/vobject.base.patch	2009-05-02 15:45:33 UTC (rev 4139)
@@ -11,6 +11,27 @@
          self.singletonparams = copy.copy(copyit.singletonparams)
          self.lineNumber = copyit.lineNumber
          
+@@ -627,16 +629,16 @@
+         print
+ 
+ class VObjectError(Exception):
+-    def __init__(self, message, lineNumber=None):
+-        self.message = message
++    def __init__(self, msg, lineNumber=None):
++        self.msg = msg
+         if lineNumber is not None:
+             self.lineNumber = lineNumber
+     def __str__(self):
+         if hasattr(self, 'lineNumber'):
+             return "At line %s: %s" % \
+-                   (self.lineNumber, self.message)
++                   (self.lineNumber, self.msg)
+         else:
+-            return repr(self.message)
++            return repr(self.msg)
+ 
+ class ParseError(VObjectError):
+     pass
 @@ -953,7 +955,9 @@
          if obj.group is not None:
              s.write(obj.group + '.')
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090502/6c5f7a75/attachment.html>