<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13160] CalendarServer/branches/users/sagen/move2who-5/calendarserver</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13160">13160</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-04 10:47:56 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>clean up</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who5calendarserverpushapplepushpy">CalendarServer/branches/users/sagen/move2who-5/calendarserver/push/applepush.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who5calendarservertoolspurgepy">CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/purge.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who5calendarservertoolstesttest_purgepy">CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/test/test_purge.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who5calendarserverpushapplepushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-5/calendarserver/push/applepush.py (13159 => 13160)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> from txweb2.http_headers import MimeType
</span><span class="cx"> from txweb2.server import parsePOSTData
</span><span class="cx"> from twisted.application import service
</span><del>-from twisted.internet import protocol
</del><ins>+from twisted.internet.protocol import Protocol
</ins><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><span class="cx"> from twisted.internet.protocol import ClientFactory, ReconnectingClientFactory
</span><span class="cx"> from twisted.internet.task import LoopingCall
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class APNProviderProtocol(protocol.Protocol):
</del><ins>+class APNProviderProtocol(Protocol):
</ins><span class="cx"> """
</span><span class="cx"> Implements the Provider portion of APNS
</span><span class="cx"> """
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> def makeConnection(self, transport):
</span><span class="cx"> self.history = TokenHistory()
</span><span class="cx"> self.log.debug("ProviderProtocol makeConnection")
</span><del>- protocol.Protocol.makeConnection(self, transport)
</del><ins>+ Protocol.makeConnection(self, transport)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def connectionMade(self):
</span><span class="lines">@@ -664,7 +664,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class APNFeedbackProtocol(protocol.Protocol):
</del><ins>+class APNFeedbackProtocol(Protocol):
</ins><span class="cx"> """
</span><span class="cx"> Implements the Feedback portion of APNS
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who5calendarservertoolspurgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/purge.py (13159 => 13160)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -979,14 +979,10 @@
</span><span class="cx"> print("Deleting addressbook: %s" % (abName,))
</span><span class="cx"> if not self.dryrun:
</span><span class="cx"> # Also remove the addressbook collection itself
</span><del>-<<<<<<< .working
</del><span class="cx"> if abColl.owned():
</span><span class="cx"> yield storeAbHome.removeChildWithName(abName)
</span><span class="cx"> else:
</span><span class="cx"> yield abColl.unshare()
</span><del>-=======
- yield storeAbHome.removeChildWithName(abColl.name())
->>>>>>> .merge-right.r13157
</del><span class="cx">
</span><span class="cx"> if self.verbose:
</span><span class="cx"> if self.dryrun:
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who5calendarservertoolstesttest_purgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-5/calendarserver/tools/test/test_purge.py (13159 => 13160)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> from calendarserver.tools.purge import PurgePrincipalService
</span><del>-
</del><ins>+from twistedcaldav.config import config
</ins><span class="cx"> from twistedcaldav.ical import Component
</span><span class="cx"> from twistedcaldav.test.util import StoreTestCase
</span><span class="cx">
</span><span class="lines">@@ -924,7 +924,7 @@
</span><span class="cx">
</span><span class="cx"> count = (yield PurgePrincipalService.purgeUIDs(self.storeUnderTest(), self.directory,
</span><span class="cx"> self.rootResource, (self.uid,), verbose=False, proxies=False, completely=False))
</span><del>- self.assertEquals(count, 1) # 1 event
</del><ins>+ self.assertEquals(count, 1) # 2 events
</ins><span class="cx">
</span><span class="cx"> # Now you still see it
</span><span class="cx"> txn = self._sqlCalendarStore.newTransaction()
</span></span></pre>
</div>
</div>
</body>
</html>