[CalendarServer-changes] [12022] CalDAVClientLibrary/trunk/caldavclientlibrary

[source_changes at macosforge.org]

Revision: 12022
          http://trac.calendarserver.org//changeset/12022
Author:   cdaboo at apple.com
Date:     2013-12-03 11:40:36 -0800 (Tue, 03 Dec 2013)
Log Message:
-----------
Minor fixes.

Modified Paths:
--------------
    CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/share.py
    CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/calendarserver/invite.py

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/share.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/share.py	2013-12-03 19:35:19 UTC (rev 12021)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/share.py	2013-12-03 19:40:36 UTC (rev 12022)
@@ -130,7 +130,7 @@
 
         if oldinvite is None:
             href = utils.textInput("Enter principal id: ", None)
-            if href.startswith("user"):
+            if href.startswith("user") or href.startswith("puser"):
                 href = "/principals/users/%s" % (href,)
             principal = self.shell.shell.account.getPrincipal(URL(url=href))
             user_uid = principal.principalURL.relativeURL()

Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/calendarserver/invite.py
===================================================================
--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/calendarserver/invite.py	2013-12-03 19:35:19 UTC (rev 12021)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/calendarserver/invite.py	2013-12-03 19:40:36 UTC (rev 12022)
@@ -46,7 +46,7 @@
 
     def parseFromInvite(self, invite):
 
-        if invite is not None:
+        if len(invite) != 0:
             organizer = invite.find(str(csxml.organizer))
             if organizer is not None:
                 self.organizer_uid = organizer.find(str(davxml.href)).text
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/2bc92e17/attachment.html>