[CalendarServer-changes] [5009] CalendarServer/branches/users/glyph/contacts-server-merge

[source_changes at macosforge.org]

Revision: 5009
          http://trac.macosforge.org/projects/calendarserver/changeset/5009
Author:   glyph at apple.com
Date:     2010-02-01 18:06:30 -0800 (Mon, 01 Feb 2010)
Log Message:
-----------
catch up with log module rename

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/contacts-server-merge/addressbookserver/tap/carddav.py
    CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/directorybackedaddressbook.py
    CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/method/copymove_contact.py
    CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/method/put_addressbook_common.py
    CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/vcardindex.py

Modified: CalendarServer/branches/users/glyph/contacts-server-merge/addressbookserver/tap/carddav.py
===================================================================
--- CalendarServer/branches/users/glyph/contacts-server-merge/addressbookserver/tap/carddav.py	2010-02-02 01:55:39 UTC (rev 5008)
+++ CalendarServer/branches/users/glyph/contacts-server-merge/addressbookserver/tap/carddav.py	2010-02-02 02:06:30 UTC (rev 5009)
@@ -32,7 +32,7 @@
 
 from twistedcaldav.config import config
 from twistedcaldav.static import AddressBookHomeProvisioningFile, DirectoryBackedAddressBookFile
-from twistedcaldav.log import Logger
+from twext.log import Logger
 
 log = Logger()
 

Modified: CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/directorybackedaddressbook.py
===================================================================
--- CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/directorybackedaddressbook.py	2010-02-02 01:55:39 UTC (rev 5008)
+++ CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/directorybackedaddressbook.py	2010-02-02 02:06:30 UTC (rev 5009)
@@ -24,7 +24,7 @@
 
 
 
-from twistedcaldav.log import Logger
+from twext.log import Logger
 from twisted.internet.defer import succeed, inlineCallbacks, maybeDeferred, returnValue
 from twisted.python.reflect import namedClass
 from twisted.web2 import responsecode

Modified: CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/method/copymove_contact.py
===================================================================
--- CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/method/copymove_contact.py	2010-02-02 01:55:39 UTC (rev 5008)
+++ CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/method/copymove_contact.py	2010-02-02 02:06:30 UTC (rev 5009)
@@ -33,7 +33,7 @@
 from twistedcaldav.carddavxml import carddav_namespace
 from twistedcaldav.method.put_addressbook_common import StoreAddressObjectResource
 from twistedcaldav.resource import isAddressBookCollectionResource
-from twistedcaldav.log import Logger
+from twext.log import Logger
 
 log = Logger()
 

Modified: CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/method/put_addressbook_common.py
===================================================================
--- CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/method/put_addressbook_common.py	2010-02-02 01:55:39 UTC (rev 5008)
+++ CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/method/put_addressbook_common.py	2010-02-02 02:06:30 UTC (rev 5009)
@@ -50,7 +50,7 @@
 from twistedcaldav.instance import TooManyInstancesError
 from twistedcaldav.vcard import Component
 from twistedcaldav.vcardindex import ReservationError
-from twistedcaldav.log import Logger
+from twext.log import Logger
 #from twistedcaldav.scheduling.implicit import ImplicitScheduler
 
 log = Logger()

Modified: CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/vcardindex.py
===================================================================
--- CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/vcardindex.py	2010-02-02 01:55:39 UTC (rev 5008)
+++ CalendarServer/branches/users/glyph/contacts-server-merge/twistedcaldav/vcardindex.py	2010-02-02 02:06:30 UTC (rev 5009)
@@ -43,7 +43,7 @@
 from twistedcaldav.sql import db_prefix
 from twistedcaldav.vcard import Component
 
-from twistedcaldav.log import Logger, LoggingMixIn
+from twext.log import Logger, LoggingMixIn
 from twistedcaldav.config import config
 from twistedcaldav.memcachepool import CachePoolUserMixIn
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100201/9487a0bb/attachment-0001.html>