<!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>[15276] CalendarServer/branches/users/cdaboo/update-packages</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/15276">15276</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-02 13:50:00 -0800 (Mon, 02 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>No more twisted.python.hashlib.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestwistedcaldavstorebridgepy">CalendarServer/branches/users/cdaboo/update-packages/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxdavbasedatastorefilepy">CalendarServer/branches/users/cdaboo/update-packages/txdav/base/datastore/file.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxdavcaldavdatastoresqlpy">CalendarServer/branches/users/cdaboo/update-packages/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxdavcaldavdatastoretestcommonpy">CalendarServer/branches/users/cdaboo/update-packages/txdav/caldav/datastore/test/common.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxdavcarddavdatastorefilepy">CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/file.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxdavcarddavdatastoresqlpy">CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxdavcarddavdatastoretestcommonpy">CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/test/common.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxdavcommondatastorefilepy">CalendarServer/branches/users/cdaboo/update-packages/txdav/common/datastore/file.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxweb2authdigestpy">CalendarServer/branches/users/cdaboo/update-packages/txweb2/auth/digest.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxweb2testtest_httpauthpy">CalendarServer/branches/users/cdaboo/update-packages/txweb2/test/test_httpauth.py</a></li>
<li><a href="#CalendarServerbranchesuserscdabooupdatepackagestxweb2testtest_streampy">CalendarServer/branches/users/cdaboo/update-packages/txweb2/test/test_stream.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdabooupdatepackagestwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/twistedcaldav/storebridge.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/twistedcaldav/storebridge.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/twistedcaldav/storebridge.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue, maybeDeferred
</span><span class="cx"> from twisted.internet.protocol import Protocol
</span><del>-from twisted.python.hashlib import md5
</del><span class="cx"> from twisted.python.util import FancyEqMixin
</span><span class="cx"> from twistedcaldav import customxml, carddavxml, caldavxml, ical
</span><span class="cx"> from twistedcaldav.caldavxml import (
</span><span class="lines">@@ -657,7 +656,7 @@
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> # Create a new name if one was not provided
</span><del>- name = md5(str(index) + component.resourceUID() + str(time.time()) + request.path).hexdigest() + self.resourceSuffix()
</del><ins>+ name = hashlib.md5(str(index) + component.resourceUID() + str(time.time()) + request.path).hexdigest() + self.resourceSuffix()
</ins><span class="cx">
</span><span class="cx"> # Get a resource for the new item
</span><span class="cx"> newchildURL = joinURL(request.path, name)
</span><span class="lines">@@ -3342,7 +3341,7 @@
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> # Create a new name if one was not provided
</span><del>- name = md5(str(index) + component.resourceUID() + str(time.time()) + request.path).hexdigest() + self.resourceSuffix()
</del><ins>+ name = hashlib.md5(str(index) + component.resourceUID() + str(time.time()) + request.path).hexdigest() + self.resourceSuffix()
</ins><span class="cx">
</span><span class="cx"> # Get a resource for the new item
</span><span class="cx"> newchildURL = joinURL(request.path, name)
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxdavbasedatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txdav/base/datastore/file.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txdav/base/datastore/file.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txdav/base/datastore/file.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> from zope.interface.declarations import implements
</span><span class="cx">
</span><del>-from twisted.python import hashlib
</del><ins>+import hashlib
</ins><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txdav/caldav/datastore/sql.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txdav/caldav/datastore/sql.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txdav/caldav/datastore/sql.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> from txweb2.stream import readStream
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><del>-from twisted.python import hashlib
</del><span class="cx"> from twisted.python.failure import Failure
</span><span class="cx">
</span><span class="cx"> from twistedcaldav import customxml, ical
</span><span class="lines">@@ -114,6 +113,7 @@
</span><span class="cx"> from urlparse import urlparse, urlunparse
</span><span class="cx"> import collections
</span><span class="cx"> import datetime
</span><ins>+import hashlib
</ins><span class="cx"> import itertools
</span><span class="cx"> import urllib
</span><span class="cx"> import uuid
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxdavcaldavdatastoretestcommonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txdav/caldav/datastore/test/common.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txdav/caldav/datastore/test/common.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txdav/caldav/datastore/test/common.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> from twisted.internet.defer import Deferred, inlineCallbacks, returnValue, \
</span><span class="cx"> maybeDeferred
</span><span class="cx"> from twisted.internet.protocol import Protocol
</span><del>-from twisted.python import hashlib
</del><span class="cx">
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><span class="cx"> from twistedcaldav.ical import Component as VComponent
</span><span class="lines">@@ -54,6 +53,7 @@
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from calendarserver.push.util import PushPriority
</span><span class="cx">
</span><ins>+import hashlib
</ins><span class="cx"> import json
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxdavcarddavdatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/file.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/file.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/file.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> from txweb2.dav.resource import TwistedGETContentMD5
</span><span class="cx"> from txweb2.http_headers import MimeType
</span><span class="cx">
</span><del>-from twisted.python import hashlib
</del><span class="cx">
</span><span class="cx"> from twistedcaldav.vcard import Component as VComponent, InvalidVCardDataError
</span><span class="cx"> from txdav.carddav.datastore.index_file import AddressBookIndex as OldIndex
</span><span class="lines">@@ -53,6 +52,8 @@
</span><span class="cx">
</span><span class="cx"> from zope.interface import implements
</span><span class="cx">
</span><ins>+import hashlib
+
</ins><span class="cx"> contentTypeKey = PropertyName.fromElement(GETContentType)
</span><span class="cx"> md5key = PropertyName.fromElement(TwistedGETContentMD5)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/sql.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/sql.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/sql.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> from txweb2.responsecode import FORBIDDEN
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, succeed
</span><del>-from twisted.python import hashlib
</del><span class="cx">
</span><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.vcard import Component as VCard, InvalidVCardDataError, Property, \
</span><span class="lines">@@ -69,7 +68,9 @@
</span><span class="cx">
</span><span class="cx"> from zope.interface.declarations import implements
</span><span class="cx">
</span><ins>+import hashlib
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class AddressBookHome(CommonHome):
</span><span class="cx">
</span><span class="cx"> implements(IAddressBookHome)
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxdavcarddavdatastoretestcommonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/test/common.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/test/common.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txdav/carddav/datastore/test/common.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> from txweb2.responsecode import FORBIDDEN
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, maybeDeferred
</span><del>-from twisted.python import hashlib
</del><span class="cx">
</span><span class="cx"> from twistedcaldav.vcard import Component as VComponent
</span><span class="cx">
</span><span class="lines">@@ -42,7 +41,9 @@
</span><span class="cx"> from txdav.xml.element import WebDAVUnknownElement
</span><span class="cx"> from calendarserver.push.util import PushPriority
</span><span class="cx">
</span><ins>+import hashlib
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> storePath = FilePath(__file__).parent().child("addressbook_store")
</span><span class="cx">
</span><span class="cx"> home1Root = storePath.child("ho").child("me").child("home1")
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxdavcommondatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txdav/common/datastore/file.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txdav/common/datastore/file.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txdav/common/datastore/file.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="cx"> from twisted.python.util import FancyEqMixin
</span><del>-from twisted.python import hashlib
</del><span class="cx"> from twisted.python.failure import Failure
</span><span class="cx">
</span><span class="cx"> from twistedcaldav import customxml
</span><span class="lines">@@ -60,6 +59,7 @@
</span><span class="cx"> from errno import EEXIST, ENOENT
</span><span class="cx"> from zope.interface import implements, directlyProvides
</span><span class="cx">
</span><ins>+import hashlib
</ins><span class="cx"> import json
</span><span class="cx"> import uuid
</span><span class="cx"> from twistedcaldav.sql import AbstractSQLDatabase, db_prefix
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxweb2authdigestpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txweb2/auth/digest.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txweb2/auth/digest.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txweb2/auth/digest.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -31,7 +31,8 @@
</span><span class="cx">
</span><span class="cx"> from zope.interface import implements
</span><span class="cx">
</span><del>-from twisted.python.hashlib import md5, sha1
</del><ins>+from hashlib import md5, sha1
+
</ins><span class="cx"> from twisted.cred import credentials
</span><span class="cx">
</span><span class="cx"> # FIXME: Technically speaking - although you can't tell from looking at them -
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxweb2testtest_httpauthpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txweb2/test/test_httpauth.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txweb2/test/test_httpauth.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txweb2/test/test_httpauth.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -1,7 +1,6 @@
</span><span class="cx"> # Copyright (c) 2006-2009 Twisted Matrix Laboratories.
</span><span class="cx"> # See LICENSE for details.
</span><span class="cx">
</span><del>-from twisted.python.hashlib import md5
</del><span class="cx"> from twisted.internet import address
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx"> from twisted.cred import error
</span><span class="lines">@@ -13,6 +12,7 @@
</span><span class="cx"> from txweb2.test import test_server
</span><span class="cx">
</span><span class="cx"> import base64
</span><ins>+from hashlib import md5
</ins><span class="cx">
</span><span class="cx"> _trivial_GET = SimpleRequest(None, 'GET', '/')
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdabooupdatepackagestxweb2testtest_streampy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/update-packages/txweb2/test/test_stream.py (15275 => 15276)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/cdaboo/update-packages/txweb2/test/test_stream.py 2015-11-02 21:40:23 UTC (rev 15275)
+++ CalendarServer/branches/users/cdaboo/update-packages/txweb2/test/test_stream.py 2015-11-02 21:50:00 UTC (rev 15276)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> Tests for the stream implementations in L{txweb2}.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+from hashlib import md5
</ins><span class="cx"> import os
</span><span class="cx"> import sys
</span><span class="cx"> import tempfile
</span><span class="lines">@@ -13,7 +14,6 @@
</span><span class="cx">
</span><span class="cx"> from twisted.python.util import sibpath
</span><span class="cx"> sibpath # sibpath is *not* unused - the doctests use it.
</span><del>-from twisted.python.hashlib import md5
</del><span class="cx"> from twisted.internet import reactor, defer, interfaces
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx"> from txweb2 import stream
</span></span></pre>
</div>
</div>
</body>
</html>