[CalendarServer-changes] [6514] CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/ caldav.py

[source_changes at macosforge.org]

Revision: 6514
          http://trac.macosforge.org/projects/calendarserver/changeset/6514
Author:   glyph at apple.com
Date:     2010-11-01 14:18:59 -0700 (Mon, 01 Nov 2010)
Log Message:
-----------
Eliminate deprecation warning

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/caldav.py

Modified: CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/caldav.py	2010-11-01 21:18:34 UTC (rev 6513)
+++ CalendarServer/branches/users/glyph/sharedpool/calendarserver/tap/caldav.py	2010-11-01 21:18:59 UTC (rev 6514)
@@ -47,7 +47,6 @@
 from twisted.internet.protocol import Protocol, Factory
 from twisted.application.internet import TCPServer, UNIXServer
 from twisted.application.service import MultiService, IServiceMaker
-from twisted.scripts.mktap import getid
 from twisted.runner import procmon
 
 import twext
@@ -98,7 +97,15 @@
 
 log = Logger()
 
+from twisted.python.util import uidFromString, gidFromString
 
+def getid(uid, gid):
+    if uid is not None:
+        uid = uidFromString(uid)
+    if gid is not None:
+        gid = gidFromString(gid)
+    return (uid, gid)
+
 class CalDAVStatisticsProtocol (Protocol): 
 
     def connectionMade(self): 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101101/88daa6d4/attachment.html>