<!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>[15410] CalendarServer/trunk</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/15410">15410</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-01-04 09:07:32 -0800 (Mon, 04 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix circular import.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverpushamppushpy">CalendarServer/trunk/calendarserver/push/amppush.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverpushapplepushpy">CalendarServer/trunk/calendarserver/push/applepush.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverpushnotifierpy">CalendarServer/trunk/calendarserver/push/notifier.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverpushtesttest_amppushpy">CalendarServer/trunk/calendarserver/push/test/test_amppush.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverpushtesttest_applepushpy">CalendarServer/trunk/calendarserver/push/test/test_applepush.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverpushtesttest_notifierpy">CalendarServer/trunk/calendarserver/push/test/test_notifier.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverpushutilpy">CalendarServer/trunk/calendarserver/push/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretestcommonpy">CalendarServer/trunk/txdav/caldav/datastore/test/common.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastoretestcommonpy">CalendarServer/trunk/txdav/carddav/datastore/test/common.py</a></li>
<li><a href="#CalendarServertrunktxdavidavpy">CalendarServer/trunk/txdav/idav.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverpushipushpy">CalendarServer/trunk/calendarserver/push/ipush.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverpushamppushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/amppush.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/amppush.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/calendarserver/push/amppush.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -14,6 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><ins>+from calendarserver.push.ipush import PushPriority
</ins><span class="cx"> from calendarserver.push.util import PushScheduler
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="lines">@@ -23,7 +24,6 @@
</span><span class="cx"> import time
</span><span class="cx"> import uuid
</span><span class="cx">
</span><del>-from calendarserver.push.util import PushPriority
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushapplepushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/applepush.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/applepush.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/calendarserver/push/applepush.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -36,9 +36,8 @@
</span><span class="cx"> import struct
</span><span class="cx"> import time
</span><span class="cx"> from txdav.common.icommondatastore import InvalidSubscriptionValues
</span><del>-from calendarserver.push.util import (
- validToken, TokenHistory, PushScheduler, PushPriority
-)
</del><ins>+from calendarserver.push.ipush import PushPriority
+from calendarserver.push.util import validToken, TokenHistory, PushScheduler
</ins><span class="cx"> from twext.internet.adaptendpoint import connect
</span><span class="cx"> from twext.internet.gaiendpoint import GAIEndpoint
</span><span class="cx"> from twisted.python.constants import Values, ValueConstant
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushipushpy"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/calendarserver/push/ipush.py (0 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/ipush.py (rev 0)
+++ CalendarServer/trunk/calendarserver/push/ipush.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+##
+# Copyright (c) 2011-2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twisted.python.constants import Values, ValueConstant
+
+
+class PushPriority(Values):
+ """
+ Constants to use for push priorities
+ """
+ low = ValueConstant(1)
+ medium = ValueConstant(5)
+ high = ValueConstant(10)
</ins></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushnotifierpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/notifier.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/notifier.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/calendarserver/push/notifier.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> import datetime
</span><span class="cx">
</span><del>-from calendarserver.push.util import PushPriority
</del><ins>+from calendarserver.push.ipush import PushPriority
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushtesttest_amppushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/test/test_amppush.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/test/test_amppush.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/calendarserver/push/test/test_amppush.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> from calendarserver.push.amppush import NotificationForID
</span><span class="cx"> from twistedcaldav.test.util import StoreTestCase
</span><span class="cx"> from twisted.internet.task import Clock
</span><del>-from calendarserver.push.util import PushPriority
</del><ins>+from calendarserver.push.ipush import PushPriority
</ins><span class="cx">
</span><span class="cx"> class AMPPushMasterTests(StoreTestCase):
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushtesttest_applepushpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/test/test_applepush.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/test/test_applepush.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/calendarserver/push/test/test_applepush.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -20,7 +20,8 @@
</span><span class="cx"> from calendarserver.push.applepush import (
</span><span class="cx"> ApplePushNotifierService, APNProviderProtocol, ApplePushPriority
</span><span class="cx"> )
</span><del>-from calendarserver.push.util import validToken, TokenHistory, PushPriority
</del><ins>+from calendarserver.push.ipush import PushPriority
+from calendarserver.push.util import validToken, TokenHistory
</ins><span class="cx"> from twistedcaldav.test.util import StoreTestCase
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><span class="cx"> from twisted.internet.task import Clock
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushtesttest_notifierpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/test/test_notifier.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/test/test_notifier.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/calendarserver/push/test/test_notifier.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> from twistedcaldav.config import ConfigDict
</span><span class="cx"> from txdav.common.datastore.test.util import populateCalendarsFrom
</span><span class="cx"> from txdav.common.datastore.sql_tables import _BIND_MODE_WRITE
</span><del>-from calendarserver.push.util import PushPriority
</del><ins>+from calendarserver.push.ipush import PushPriority
</ins><span class="cx"> from txdav.idav import ChangeCategory
</span><span class="cx"> from twext.enterprise.jobs.jobitem import JobItem
</span><span class="cx"> from twisted.internet import reactor
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/util.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/util.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/calendarserver/push/util.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -16,8 +16,6 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx">
</span><del>-from twisted.python.constants import Values, ValueConstant
-
</del><span class="cx"> from twistedcaldav.util import getPasswordFromKeychain, KeychainAccessError, \
</span><span class="cx"> KeychainPasswordNotFound
</span><span class="cx">
</span><span class="lines">@@ -28,16 +26,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-class PushPriority(Values):
- """
- Constants to use for push priorities
- """
- low = ValueConstant(1)
- medium = ValueConstant(5)
- high = ValueConstant(10)
-
-
-
</del><span class="cx"> def getAPNTopicFromConfig(protocol, accountName, protoConfig):
</span><span class="cx"> """
</span><span class="cx"> Given the APNS protocol config, extract the APN topic.
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretestcommonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/common.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/common.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/common.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> from txdav.common.icommondatastore import ConcurrentModification
</span><span class="cx"> from twistedcaldav.ical import Component
</span><span class="cx"> from twistedcaldav.config import config
</span><del>-from calendarserver.push.util import PushPriority
</del><ins>+from calendarserver.push.ipush import PushPriority
</ins><span class="cx">
</span><span class="cx"> import hashlib
</span><span class="cx"> import json
</span></span></pre></div>
<a id="CalendarServertrunktxdavcarddavdatastoretestcommonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/test/common.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/test/common.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/txdav/carddav/datastore/test/common.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> from txdav.common.icommondatastore import ObjectResourceNameAlreadyExistsError
</span><span class="cx"> from txdav.idav import IPropertyStore, IDataStore
</span><span class="cx"> from txdav.xml.element import WebDAVUnknownElement
</span><del>-from calendarserver.push.util import PushPriority
</del><ins>+from calendarserver.push.ipush import PushPriority
</ins><span class="cx">
</span><span class="cx"> import hashlib
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavidavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/idav.py (15409 => 15410)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/idav.py 2015-12-21 21:27:08 UTC (rev 15409)
+++ CalendarServer/trunk/txdav/idav.py 2016-01-04 17:07:32 UTC (rev 15410)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> from zope.interface.common.mapping import IMapping
</span><span class="cx">
</span><span class="cx"> from twisted.python.constants import Values, ValueConstant
</span><del>-from calendarserver.push.util import PushPriority
</del><ins>+from calendarserver.push.ipush import PushPriority
</ins><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # Exceptions
</span></span></pre>
</div>
</div>
</body>
</html>