Revision: 9283 http://trac.macosforge.org/projects/calendarserver/changeset/9283 Author: glyph@apple.com Date: 2012-05-24 13:34:01 -0700 (Thu, 24 May 2012) Log Message: ----------- That variable is used later too. Modified Paths: -------------- CalendarServer/branches/users/glyph/uuid-normalize/txdav/caldav/datastore/util.py Modified: CalendarServer/branches/users/glyph/uuid-normalize/txdav/caldav/datastore/util.py =================================================================== --- CalendarServer/branches/users/glyph/uuid-normalize/txdav/caldav/datastore/util.py 2012-05-24 20:33:58 UTC (rev 9282) +++ CalendarServer/branches/users/glyph/uuid-normalize/txdav/caldav/datastore/util.py 2012-05-24 20:34:01 UTC (rev 9283) @@ -20,7 +20,6 @@ """ import os -from uuid import UUID from zope.interface.declarations import implements @@ -338,8 +337,8 @@ @return: a L{Deferred} that fires with C{None} when the migration is complete. """ + from twistedcaldav.config import config if not merge: - from twistedcaldav.config import config yield outHome.removeCalendarWithName("calendar") if config.RestrictCalendarsToOneComponentType: yield outHome.removeCalendarWithName("tasks")