<!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>[14537] CalendarServer/branches/users/sagen/trashcan-5</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/14537">14537</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-09 15:53:51 -0700 (Mon, 09 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Getting closer to having all unit tests pass</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagentrashcan5twistedcaldavtesttest_collectioncontentspy">CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/test/test_collectioncontents.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoreschedulingicalsplitterpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/icalsplitter.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcarddavdatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/carddav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresql_externalpy">CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql_external.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagentrashcan5twistedcaldavtesttest_collectioncontentspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/test/test_collectioncontents.py (14536 => 14537)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/test/test_collectioncontents.py 2015-03-09 21:24:54 UTC (rev 14536)
+++ CalendarServer/branches/users/sagen/trashcan-5/twistedcaldav/test/test_collectioncontents.py 2015-03-09 22:53:51 UTC (rev 14537)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> _getFakeMemcacheProtocol)
</span><span class="cx">
</span><span class="cx"> # Need to not do implicit behavior during these tests
</span><del>- def _fakeDoImplicitScheduling(self, component, inserting, internal_state, options):
</del><ins>+ def _fakeDoImplicitScheduling(self, component, inserting, internal_state, options, updateSelf=False):
</ins><span class="cx"> return False, None, False, None
</span><span class="cx">
</span><span class="cx"> self.patch(CalendarObject, "doImplicitScheduling",
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoreschedulingicalsplitterpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/icalsplitter.py (14536 => 14537)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/icalsplitter.py 2015-03-09 21:24:54 UTC (rev 14536)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/scheduling/icalsplitter.py 2015-03-09 22:53:51 UTC (rev 14537)
</span><span class="lines">@@ -70,7 +70,10 @@
</span><span class="cx">
</span><span class="cx"> # Check recurring
</span><span class="cx"> if not ical.isRecurring():
</span><del>- fullyInFuture = (ical.mainComponent().getStartDateUTC() >= now)
</del><ins>+ try:
+ fullyInFuture = (ical.mainComponent().getStartDateUTC() >= now)
+ except AttributeError:
+ fullyInFuture = False
</ins><span class="cx"> return (False, fullyInFuture)
</span><span class="cx">
</span><span class="cx"> instances = ical.cacheExpandedTimeRanges(now)
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py (14536 => 14537)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-03-09 21:24:54 UTC (rev 14536)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/caldav/datastore/sql.py 2015-03-09 22:53:51 UTC (rev 14537)
</span><span class="lines">@@ -3983,6 +3983,7 @@
</span><span class="cx"> if isinbox: # bypass the trash
</span><span class="cx"> yield super(CalendarObject, self).reallyRemove()
</span><span class="cx"> else:
</span><ins>+ calendar = (yield self.componentForUser())
</ins><span class="cx"> status = calendar.mainComponent().getProperty("STATUS")
</span><span class="cx"> if status is not None:
</span><span class="cx"> status = status.strvalue()
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/carddav/datastore/sql.py (14536 => 14537)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/carddav/datastore/sql.py 2015-03-09 21:24:54 UTC (rev 14536)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/carddav/datastore/sql.py 2015-03-09 22:53:51 UTC (rev 14537)
</span><span class="lines">@@ -1204,7 +1204,7 @@
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> @inlineCallbacks
</span><del>- def objectWithName(cls, home, name, accepted=True):
</del><ins>+ def objectWithName(cls, home, name, accepted=True, onlyInTrash=False):
</ins><span class="cx"> """
</span><span class="cx"> Retrieve the child with the given C{name} contained in the given
</span><span class="cx"> C{home}.
</span><span class="lines">@@ -1232,7 +1232,7 @@
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> @inlineCallbacks
</span><del>- def objectWithID(cls, home, resourceID, accepted=True):
</del><ins>+ def objectWithID(cls, home, resourceID, accepted=True, onlyInTrash=False):
</ins><span class="cx"> """
</span><span class="cx"> Retrieve the child with the given C{resourceID} contained in the given
</span><span class="cx"> C{home}.
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py (14536 => 14537)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-03-09 21:24:54 UTC (rev 14536)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql.py 2015-03-09 22:53:51 UTC (rev 14537)
</span><span class="lines">@@ -3464,7 +3464,7 @@
</span><span class="cx">
</span><span class="cx"> if not self._childrenLoaded:
</span><span class="cx"> yield self.loadChildren()
</span><del>- names = [k for k in self._children[self._childrenKey(onlyInTrash)].keys() if isinstance(k, str)]
</del><ins>+ names = [k for k in self._children[self._childrenKey(onlyInTrash)].keys() if not isinstance(k, int)]
</ins><span class="cx"> returnValue(names)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -3549,12 +3549,12 @@
</span><span class="cx"> child = yield self.childWithName(name)
</span><span class="cx"> if child is None:
</span><span class="cx"> raise NoSuchHomeChildError()
</span><ins>+ key = self._childrenKey(child.isInTrash())
</ins><span class="cx"> resourceID = child._resourceID
</span><span class="cx">
</span><span class="cx"> yield child.remove()
</span><del>- for d in self._children:
- d.pop(name, None)
- d.pop(resourceID, None)
</del><ins>+ self._children[key].pop(name, None)
+ self._children[key].pop(resourceID, None)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -6250,7 +6250,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def isInTrash(self):
</span><del>- return self._isInTrash
</del><ins>+ return getattr(self, "_isInTrash", False)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagentrashcan5txdavcommondatastoresql_externalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql_external.py (14536 => 14537)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql_external.py 2015-03-09 21:24:54 UTC (rev 14536)
+++ CalendarServer/branches/users/sagen/trashcan-5/txdav/common/datastore/sql_external.py 2015-03-09 22:53:51 UTC (rev 14537)
</span><span class="lines">@@ -216,8 +216,8 @@
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> @inlineCallbacks
</span><del>- def objectWith(cls, home, name=None, resourceID=None, externalID=None, accepted=True):
- mapping = yield home._txn.store().conduit.send_homechild_objectwith(home, name, resourceID, externalID, accepted)
</del><ins>+ def objectWith(cls, home, name=None, resourceID=None, externalID=None, accepted=True, onlyInTrash=False):
+ mapping = yield home._txn.store().conduit.send_homechild_objectwith(home, name, resourceID, externalID, accepted, onlyInTrash)
</ins><span class="cx">
</span><span class="cx"> if mapping:
</span><span class="cx"> child = yield cls.internalize(home, mapping)
</span></span></pre>
</div>
</div>
</body>
</html>