[CalendarServer-changes] [13160] CalendarServer/branches/users/sagen/move2who-5/calendarserver

[source_changes at macosforge.org]

Revision: 13160
          http://trac.calendarserver.org//changeset/13160
Author:   sagen at apple.com
Date:     2014-04-04 10:47:56 -0700 (Fri, 04 Apr 2014)
Log Message:
-----------
clean up

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-5/calendarserver/push/applepush.py
    CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/purge.py
    CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/test/test_purge.py

Modified: CalendarServer/branches/users/sagen/move2who-5/calendarserver/push/applepush.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-5/calendarserver/push/applepush.py	2014-04-04 17:20:41 UTC (rev 13159)
+++ CalendarServer/branches/users/sagen/move2who-5/calendarserver/push/applepush.py	2014-04-04 17:47:56 UTC (rev 13160)
@@ -25,7 +25,7 @@
 from txweb2.http_headers import MimeType
 from txweb2.server import parsePOSTData
 from twisted.application import service
-from twisted.internet import protocol
+from twisted.internet.protocol import Protocol
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twisted.internet.protocol import ClientFactory, ReconnectingClientFactory
 from twisted.internet.task import LoopingCall
@@ -238,7 +238,7 @@
 
 
 
-class APNProviderProtocol(protocol.Protocol):
+class APNProviderProtocol(Protocol):
     """
     Implements the Provider portion of APNS
     """
@@ -273,7 +273,7 @@
     def makeConnection(self, transport):
         self.history = TokenHistory()
         self.log.debug("ProviderProtocol makeConnection")
-        protocol.Protocol.makeConnection(self, transport)
+        Protocol.makeConnection(self, transport)
 
 
     def connectionMade(self):
@@ -664,7 +664,7 @@
 
 
 
-class APNFeedbackProtocol(protocol.Protocol):
+class APNFeedbackProtocol(Protocol):
     """
     Implements the Feedback portion of APNS
     """

Modified: CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/purge.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/purge.py	2014-04-04 17:20:41 UTC (rev 13159)
+++ CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/purge.py	2014-04-04 17:47:56 UTC (rev 13160)
@@ -979,14 +979,10 @@
                             print("Deleting addressbook: %s" % (abName,))
                     if not self.dryrun:
                         # Also remove the addressbook collection itself
-<<<<<<< .working
                         if abColl.owned():
                             yield storeAbHome.removeChildWithName(abName)
                         else:
                             yield abColl.unshare()
-=======
-                        yield storeAbHome.removeChildWithName(abColl.name())
->>>>>>> .merge-right.r13157
 
                 if self.verbose:
                     if self.dryrun:

Modified: CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/test/test_purge.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/test/test_purge.py	2014-04-04 17:20:41 UTC (rev 13159)
+++ CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/test/test_purge.py	2014-04-04 17:47:56 UTC (rev 13160)
@@ -16,7 +16,7 @@
 
 
 from calendarserver.tools.purge import PurgePrincipalService
-
+from twistedcaldav.config import config
 from twistedcaldav.ical import Component
 from twistedcaldav.test.util import StoreTestCase
 
@@ -924,7 +924,7 @@
 
         count = (yield PurgePrincipalService.purgeUIDs(self.storeUnderTest(), self.directory,
             self.rootResource, (self.uid,), verbose=False, proxies=False, completely=False))
-        self.assertEquals(count, 1) # 1 event
+        self.assertEquals(count, 1) # 2 events
 
         # Now you still see it
         txn = self._sqlCalendarStore.newTransaction()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140404/3df38699/attachment.html>