<!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>[12605] twext/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/12605">12605</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 11:06:03 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>_DEVELOP -> _DEVELOP_PROJECT_</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunkbin_buildsh">twext/trunk/bin/_build.sh</a></li>
<li><a href="#twexttrunkbindevelop">twext/trunk/bin/develop</a></li>
<li><a href="#twexttrunkbinpyflakes">twext/trunk/bin/pyflakes</a></li>
<li><a href="#twexttrunkbinpython">twext/trunk/bin/python</a></li>
<li><a href="#twexttrunkbintest">twext/trunk/bin/test</a></li>
<li><a href="#twexttrunkbintrial">twext/trunk/bin/trial</a></li>
<li><a href="#twexttrunkbintwistd">twext/trunk/bin/twistd</a></li>
<li><a href="#twexttrunksetuppy">twext/trunk/setup.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_directorypy">twext/trunk/twext/who/test/test_directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/_build.sh (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/_build.sh 2014-02-07 18:59:49 UTC (rev 12604)
+++ twext/trunk/bin/_build.sh 2014-02-07 19:06:03 UTC (rev 12605)
</span><span class="lines">@@ -97,6 +97,8 @@
</span><span class="cx">
</span><span class="cx"> python="${py_bindir}/python";
</span><span class="cx">
</span><ins>+ project="$(setup_print name)";
+
</ins><span class="cx"> if [ -z "${TWEXT_PKG_CACHE-}" ]; then
</span><span class="cx"> dep_packages="${dev_home}/pkg";
</span><span class="cx"> else
</span><span class="lines">@@ -104,6 +106,7 @@
</span><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> export PYTHONPATH="${wd}:${PYTHONPATH:-}";
</span><ins>+ export _DEVELOP_PROJECT_="${project}";
</ins><span class="cx">
</span><span class="cx"> # These variables are defaults for things which might be configured by
</span><span class="cx"> # environment; only set them if they're un-set.
</span><span class="lines">@@ -527,6 +530,20 @@
</span><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> ruler;
</span><ins>+ if type -P memcached > /dev/null; then
+ using_system "memcached";
+ else
+ local le="libevent-2.0.21-stable";
+ local mc="memcached-1.4.16";
+ c_dependency -m "b2405cc9ebf264aa47ff615d9de527a2" \
+ "libevent" "${le}" \
+ "http://github.com/downloads/libevent/libevent/${le}.tar.gz";
+ c_dependency -m "1c5781fecb52d70b615c6d0c9c140c9c" \
+ "memcached" "${mc}" \
+ "http://www.memcached.org/files/${mc}.tar.gz";
+ fi;
+
+ ruler;
</ins><span class="cx"> if type -P postgres > /dev/null; then
</span><span class="cx"> using_system "Postgres";
</span><span class="cx"> else
</span></span></pre></div>
<a id="twexttrunkbindevelop"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/develop (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/develop 2014-02-07 18:59:49 UTC (rev 12604)
+++ twext/trunk/bin/develop 2014-02-07 19:06:03 UTC (rev 12605)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> wd="$(cd "$(dirname "$0")/.." && pwd)";
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>-export _DEVELOP="true";
-
</del><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> develop;
</span></span></pre></div>
<a id="twexttrunkbinpyflakes"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/pyflakes (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/pyflakes 2014-02-07 18:59:49 UTC (rev 12604)
+++ twext/trunk/bin/pyflakes 2014-02-07 19:06:03 UTC (rev 12605)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx">
</span><span class="cx"> wd="$(cd "$(dirname "$0")/.." && pwd -L)";
</span><span class="cx">
</span><del>-export _DEVELOP="true";
-
</del><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span></span></pre></div>
<a id="twexttrunkbinpython"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/python (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/python 2014-02-07 18:59:49 UTC (rev 12604)
+++ twext/trunk/bin/python 2014-02-07 19:06:03 UTC (rev 12605)
</span><span class="lines">@@ -21,10 +21,6 @@
</span><span class="cx">
</span><span class="cx"> wd="$(cd "$(dirname "$0")/.." && pwd)";
</span><span class="cx">
</span><del>-export _DEVELOP="true";
-
-export PYTHONPATH="${wd}:${PYTHONPATH:-}";
-
</del><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span></span></pre></div>
<a id="twexttrunkbintest"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/test (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/test 2014-02-07 18:59:49 UTC (rev 12604)
+++ twext/trunk/bin/test 2014-02-07 19:06:03 UTC (rev 12605)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> wd="$(cd "$(dirname "$0")/.." && pwd -L)";
</span><span class="cx">
</span><del>-export _DEVELOP="true";
-
</del><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span><span class="lines">@@ -86,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> if [ $# -eq 0 ]; then
</span><span class="cx"> lint="true";
</span><del>- set - twext;
</del><ins>+ set - calendarserver twistedcaldav txdav txweb2 contrib;
</ins><span class="cx"> else
</span><span class="cx"> lint="false";
</span><span class="cx"> fi;
</span><span class="lines">@@ -94,6 +92,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #
</span><ins>+# Dependencies
+#
+
+#c_dependencies >> "${dev_home}/setup.log";
+#py_dependencies >> "${dev_home}/setup.log";
+
+
+
+#
</ins><span class="cx"> # Clean up
</span><span class="cx"> #
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunkbintrial"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/trial (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/trial 2014-02-07 18:59:49 UTC (rev 12604)
+++ twext/trunk/bin/trial 2014-02-07 19:06:03 UTC (rev 12605)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx">
</span><span class="cx"> wd="$(cd "$(dirname "$0")/.." && pwd)";
</span><span class="cx">
</span><del>-export _DEVELOP="true";
-
</del><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span></span></pre></div>
<a id="twexttrunkbintwistd"></a>
<div class="modfile"><h4>Modified: twext/trunk/bin/twistd (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/bin/twistd 2014-02-07 18:59:49 UTC (rev 12604)
+++ twext/trunk/bin/twistd 2014-02-07 19:06:03 UTC (rev 12605)
</span><span class="lines">@@ -21,8 +21,6 @@
</span><span class="cx">
</span><span class="cx"> wd="$(cd "$(dirname "$0")/.." && pwd)";
</span><span class="cx">
</span><del>-export _DEVELOP="true";
-
</del><span class="cx"> . "${wd}/bin/_build.sh";
</span><span class="cx">
</span><span class="cx"> init_build > /dev/null;
</span></span></pre></div>
<a id="twexttrunksetuppy"></a>
<div class="modfile"><h4>Modified: twext/trunk/setup.py (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/setup.py 2014-02-07 18:59:49 UTC (rev 12604)
+++ twext/trunk/setup.py 2014-02-07 19:06:03 UTC (rev 12605)
</span><span class="lines">@@ -97,10 +97,13 @@
</span><span class="cx"> return full_version
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # Options
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+name = "twextpy"
+
</ins><span class="cx"> description = "Extensions to Twisted"
</span><span class="cx">
</span><span class="cx"> long_description = file(joinpath(dirname(__file__), "README.rst")).read()
</span><span class="lines">@@ -118,7 +121,16 @@
</span><span class="cx"> "Topic :: Software Development :: Libraries :: Python Modules",
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+author = "Apple Inc."
</ins><span class="cx">
</span><ins>+author_email = "calendarserver-dev@lists.macosforge.org"
+
+license = "Apache License, Version 2.0"
+
+platforms = ["all"]
+
+
+
</ins><span class="cx"> #
</span><span class="cx"> # Dependencies
</span><span class="cx"> #
</span><span class="lines">@@ -146,18 +158,12 @@
</span><span class="cx"> # Requirements for development and testing
</span><span class="cx"> develop_requirements = read_requirements("py_develop.txt")
</span><span class="cx">
</span><del>-if environment.get("_DEVELOP", "false") == "true":
</del><ins>+if environment.get("_DEVELOP_PROJECT_", None) == name:
</ins><span class="cx"> install_requirements.extend(develop_requirements)
</span><span class="cx"> install_requirements.extend(chain(*extras_requirements.values()))
</span><span class="cx">
</span><del>- # Remove cx_Oracle here because we don't automate it's installation.
- install_requirements = [
- r for r in install_requirements
- if not r.startswith("cx-Oracle")
- ]
</del><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> #
</span><span class="cx"> # Set up Extension modules that need to be built
</span><span class="cx"> #
</span><span class="lines">@@ -193,16 +199,16 @@
</span><span class="cx"> version_file.close()
</span><span class="cx">
</span><span class="cx"> setup(
</span><del>- name="twextpy",
</del><ins>+ name=name,
</ins><span class="cx"> version=version_string,
</span><span class="cx"> description=description,
</span><span class="cx"> long_description=long_description,
</span><span class="cx"> url=url,
</span><span class="cx"> classifiers=classifiers,
</span><del>- author="Apple Inc.",
- author_email="calendarserver-dev@lists.macosforge.org",
- license="Apache License, Version 2.0",
- platforms=["all"],
</del><ins>+ author=author,
+ author_email=author_email,
+ license=license,
+ platforms=platforms,
</ins><span class="cx"> packages=find_packages(),
</span><span class="cx"> package_data={},
</span><span class="cx"> scripts=[],
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_directory.py (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_directory.py 2014-02-07 18:59:49 UTC (rev 12604)
+++ twext/trunk/twext/who/test/test_directory.py 2014-02-07 19:06:03 UTC (rev 12605)
</span><span class="lines">@@ -833,7 +833,7 @@
</span><span class="cx"> plugh = self.serviceClass(u"plugh")
</span><span class="cx">
</span><span class="cx"> wsanchez = self.makeRecord(self.fields_wsanchez)
</span><del>- wsanchezmod = self.makeRecord(self.fields_wsanchez, plugh)
</del><ins>+ wsanchezmod = self.makeRecord(self.fields_wsanchez, service=plugh)
</ins><span class="cx"> glyph = self.makeRecord(self.fields_glyph)
</span><span class="cx"> glyphmod = self.makeRecord(fields_glyphmod)
</span><span class="cx">
</span><span class="lines">@@ -844,6 +844,16 @@
</span><span class="cx"> self.assertNotEqual(wsanchez, wsanchezmod) # Different service
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_compareOtherType(self):
+ """
+ Comparison of records with other object types.
+ """
+ wsanchez = self.makeRecord(self.fields_wsanchez)
+
+ self.assertIdentical(wsanchez.__eq__(object()), NotImplemented)
+ self.assertIdentical(wsanchez.__ne__(object()), NotImplemented)
+
+
</ins><span class="cx"> def test_attributeAccess(self):
</span><span class="cx"> """
</span><span class="cx"> Fields can be accessed as attributes.
</span><span class="lines">@@ -922,7 +932,52 @@
</span><span class="cx"> raise NotImplementedError("Subclasses should implement this test.")
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_verifyPlaintextPassword(self):
+ """
+ Plain text authentication.
+ """
+ password = u"secret"
</ins><span class="cx">
</span><ins>+ fields = self.fields_wsanchez.copy()
+ fields[FieldName.password] = password
+
+ wsanchez = self.makeRecord(fields)
+
+ self.assertTrue((yield wsanchez.verifyPlaintextPassword(password)))
+ self.assertFalse((yield wsanchez.verifyPlaintextPassword(u"bleargh")))
+
+
+ @inlineCallbacks
+ def test_verifyHTTPDigest(self):
+ """
+ HTTP digest authentication.
+ """
+ password = u"secret"
+
+ fields = self.fields_wsanchez.copy()
+ fields[FieldName.password] = password
+
+ wsanchez = self.makeRecord(fields)
+
+ result = yield wsanchez.verifyHTTPDigest(
+ username=u"wsanchez",
+ realm=None,
+ nonce=None,
+ cnonce=None,
+ algorithm=None,
+ nc=None,
+ qop=None,
+ response=None,
+ )
+
+ self.assertTrue(result)
+ raise NotImplementedError()
+
+ test_verifyHTTPDigest.todo = "unimplemented"
+
+
+
</ins><span class="cx"> class DirectoryRecordTest(unittest.TestCase, BaseDirectoryRecordTest):
</span><span class="cx"> """
</span><span class="cx"> Tests for L{DirectoryRecord}.
</span></span></pre>
</div>
</div>
</body>
</html>