<!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>[14178] CalDAVTester/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/14178">14178</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-11-16 14:35:52 -0800 (Sun, 16 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update to latest tzdist spec.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVcaldavtestdtd">CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCalDAVtimezonestdservicexml">CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml</a></li>
<li><a href="#CalDAVTestertrunkscriptstestsCardDAVcaldavtestdtd">CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd</a></li>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVcaldavtestdtd">CalDAVTester/trunk/scripts/tests-pod/CalDAV/caldavtest.dtd</a></li>
<li><a href="#CalDAVTestertrunksrccaldavtestpy">CalDAVTester/trunk/src/caldavtest.py</a></li>
<li><a href="#CalDAVTestertrunksrcrequestpy">CalDAVTester/trunk/src/request.py</a></li>
<li><a href="#CalDAVTestertrunksrcxmlDefspy">CalDAVTester/trunk/src/xmlDefs.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestsCalDAVcaldavtestdtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd (14177 => 14178)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd        2014-11-15 16:44:20 UTC (rev 14177)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/caldavtest.dtd        2014-11-16 22:35:52 UTC (rev 14178)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">                 
</span><span class="cx">                 <!ELEMENT method (#PCDATA)>
</span><span class="cx">                 <!ELEMENT ruri (#PCDATA)>
</span><ins>+                        <!ATTLIST ruri quote (yes|no) "yes">
</ins><span class="cx">                 <!ELEMENT header (name, value)>
</span><span class="cx">                         <!ELEMENT name (#PCDATA)>
</span><span class="cx">                         <!ELEMENT value (#PCDATA)>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCalDAVtimezonestdservicexml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml (14177 => 14178)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml        2014-11-15 16:44:20 UTC (rev 14177)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/timezonestdservice.xml        2014-11-16 22:35:52 UTC (rev 14178)
</span><span class="lines">@@ -154,16 +154,16 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-action</value>
</del><ins>+                                                <value>/error-code~$invalid-action</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='2'>
</span><del>-                        <description>GET on resource - invalid action</description>
</del><ins>+                        <description>GET on resource - invalid child URI</description>
</ins><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=true</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/foobar</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -172,29 +172,11 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-action</value>
</del><ins>+                                                <value>/error-code~$invalid-action</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><del>-                <test name='3'>
-                        <description>GET on resource - multiple actions</description>
-                        <request>
-                                <method>GET</method>
-                                <ruri>$timezonestdservice:?action=list&amp;action=list</ruri>
-                                <verify>
-                                        <callback>jsonPointerMatch</callback>
-                                        <arg>
-                                                <name>status</name>
-                                                <value>400</value>
-                                        </arg>
-                                        <arg>
-                                                <name>exists</name>
-                                                <value>/error~$invalid-action</value>
-                                        </arg>
-                                </verify>
-                        </request>
-                </test>
</del><span class="cx">         </test-suite>
</span><span class="cx">         
</span><span class="cx">         <test-suite name='Query method=capabilities'>
</span><span class="lines">@@ -202,7 +184,7 @@
</span><span class="cx">                         <description>GET on resource</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=capabilities</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/capabilities</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -226,7 +208,7 @@
</span><span class="cx">                         <description>GET on resource</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=list</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -243,10 +225,10 @@
</span><span class="cx">         
</span><span class="cx">         <test-suite name='Invalid query action=get'>
</span><span class="cx">                 <test name='1'>
</span><del>-                        <description>GET on resource - no tzid</description>
</del><ins>+                        <description>GET on resource - multiple tzid paths</description>
</ins><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=get</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/zones/America%2FNew_York/America%2FLos_Angeles</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -255,43 +237,25 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-tzid</value>
</del><ins>+                                                <value>/error-code~$invalid-action</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='2'>
</span><del>-                        <description>GET on resource - multiple tzid</description>
</del><ins>+                        <description>GET on resource - missing tzid</description>
</ins><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=get&amp;tzid=America/New_York&amp;tzid=America/Los_Angeles</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/zones/America%2FPittsburgh</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>status</name>
</span><del>-                                                <value>400</value>
-                                        </arg>
-                                        <arg>
-                                                <name>exists</name>
-                                                <value>/error~$invalid-tzid</value>
-                                        </arg>
-                                </verify>
-                        </request>
-                </test>
-                <test name='3'>
-                        <description>GET on resource - invalid tzid</description>
-                        <request>
-                                <method>GET</method>
-                                <ruri>$timezonestdservice:?action=get&amp;tzid=America/Pittsburgh</ruri>
-                                <verify>
-                                        <callback>jsonPointerMatch</callback>
-                                        <arg>
-                                                <name>status</name>
</del><span class="cx">                                                 <value>404</value>
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$tzid-not-found</value>
</del><ins>+                                                <value>/error-code~$tzid-not-found</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -303,7 +267,7 @@
</span><span class="cx">                         <description>GET on resource</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=get&amp;tzid=America/New_York</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/zones/America%2FNew_York</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="lines">@@ -324,7 +288,7 @@
</span><span class="cx">                         <description>GET on resource</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=get&amp;tzid=Europe/London</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/zones/Europe%2FLondon/</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="lines">@@ -345,7 +309,7 @@
</span><span class="cx">                         <description>GET on resource</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=get&amp;tzid=GB</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/zones/GB</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="lines">@@ -369,7 +333,7 @@
</span><span class="cx">                         <description>GET on resource - no tzid</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/observances</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -378,7 +342,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-tzid</value>
</del><ins>+                                                <value>/error-code~$invalid-action</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -387,7 +351,7 @@
</span><span class="cx">                         <description>GET on resource - multiple tzid</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;tzid=America/Los_Angeles</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York/America%2FLos_Angeles</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -396,16 +360,16 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-tzid</value>
</del><ins>+                                                <value>/error-code~$invalid-action</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='3'>
</span><del>-                        <description>GET on resource - invalid tzid</description>
</del><ins>+                        <description>GET on resource - missing tzid</description>
</ins><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/Pittsburgh;start=2008-01-01T00:00:00Z</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FPittsburgh?start=2008-01-01T00:00:00Z&amp;end=2020-01-01T00:00:00Z</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -414,7 +378,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$tzid-not-found</value>
</del><ins>+                                                <value>/error-code~$tzid-not-found</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -423,7 +387,7 @@
</span><span class="cx">                         <description>GET on resource - too many start</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;start=2009-01-01T00:00:00Z</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York?start=2008-01-01T00:00:00Z&amp;start=2009-01-01T00:00:00Z</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -432,7 +396,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-start</value>
</del><ins>+                                                <value>/error-code~$invalid-start</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -441,7 +405,7 @@
</span><span class="cx">                         <description>GET on resource - no start</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -450,7 +414,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-start</value>
</del><ins>+                                                <value>/error-code~$invalid-start</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -459,7 +423,7 @@
</span><span class="cx">                         <description>GET on resource - invalid start</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=20070101</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York?start=20070101</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -468,7 +432,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-start</value>
</del><ins>+                                                <value>/error-code~$invalid-start</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -477,7 +441,7 @@
</span><span class="cx">                         <description>GET on resource - too many end</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z&amp;end=2009</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York?start=2008-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z&amp;end=2009</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -486,7 +450,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-end</value>
</del><ins>+                                                <value>/error-code~$invalid-end</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -495,7 +459,7 @@
</span><span class="cx">                         <description>GET on resource - invalid end</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2009</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York?start=2008-01-01T00:00:00Z&amp;end=2009</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -504,7 +468,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-end</value>
</del><ins>+                                                <value>/error-code~$invalid-end</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -513,7 +477,7 @@
</span><span class="cx">                         <description>GET on resource - start > end</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2009-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York?start=2009-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -522,7 +486,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-end</value>
</del><ins>+                                                <value>/error-code~$invalid-end</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -531,7 +495,7 @@
</span><span class="cx">                         <description>GET on resource - start == end</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York?start=2008-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -540,7 +504,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-end</value>
</del><ins>+                                                <value>/error-code~$invalid-end</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -552,7 +516,7 @@
</span><span class="cx">                         <description>GET on resource - simple range</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York?start=2008-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -574,7 +538,7 @@
</span><span class="cx">                         <description>GET on resource - complex range</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/New_York&amp;start=2006-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York?start=2006-01-01T00:00:00Z&amp;end=2008-01-01T00:00:00Z</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -598,7 +562,7 @@
</span><span class="cx">                         <description>GET on resource - no DST</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=expand&amp;tzid=America/Phoenix&amp;start=2006-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FPhoenix?start=2006-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>statusCode</callback>
</span><span class="cx">                                 </verify>
</span><span class="lines">@@ -621,7 +585,7 @@
</span><span class="cx">                         <description>GET on resource trailing slash - simple range</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:/?action=expand&amp;tzid=America/New_York&amp;start=2008-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z</ruri>
</del><ins>+                                <ruri quote="no">$timezonestdservice:/observances/America%2FNew_York/?start=2008-01-01T00:00:00Z&amp;end=2009-01-01T00:00:00Z</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -644,10 +608,10 @@
</span><span class="cx">         
</span><span class="cx">         <test-suite name='Invalid query action=find'>
</span><span class="cx">                 <test name='1'>
</span><del>-                        <description>GET on resource - no pattern</description>
</del><ins>+                        <description>GET on resource - multiple pattern</description>
</ins><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=America/New_York&amp;pattern=America/Los_Angeles</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -656,16 +620,16 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-pattern</value>
</del><ins>+                                                <value>/error-code~$invalid-pattern</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name='2'>
</span><del>-                        <description>GET on resource - multiple pattern</description>
</del><ins>+                        <description>GET on resource - empty pattern</description>
</ins><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=America/New_York&amp;pattern=America/Los_Angeles</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=*</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -674,7 +638,7 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-pattern</value>
</del><ins>+                                                <value>/error-code~$invalid-pattern</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="lines">@@ -683,7 +647,7 @@
</span><span class="cx">                         <description>GET on resource - empty pattern</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=*</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=**</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -692,29 +656,11 @@
</span><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>exists</name>
</span><del>-                                                <value>/error~$invalid-pattern</value>
</del><ins>+                                                <value>/error-code~$invalid-pattern</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><del>-                <test name='4'>
-                        <description>GET on resource - empty pattern</description>
-                        <request>
-                                <method>GET</method>
-                                <ruri>$timezonestdservice:?action=find&amp;pattern=**</ruri>
-                                <verify>
-                                        <callback>jsonPointerMatch</callback>
-                                        <arg>
-                                                <name>status</name>
-                                                <value>400</value>
-                                        </arg>
-                                        <arg>
-                                                <name>exists</name>
-                                                <value>/error~$invalid-pattern</value>
-                                        </arg>
-                                </verify>
-                        </request>
-                </test>
</del><span class="cx">         </test-suite>
</span><span class="cx">
</span><span class="cx">         <test-suite name='Query method=find'>
</span><span class="lines">@@ -722,7 +668,7 @@
</span><span class="cx">                         <description>GET on resource - exact tzid</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=America/New_York</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=America/New_York</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -737,7 +683,7 @@
</span><span class="cx">                         <description>GET on resource - starts tzid</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=America/New_*</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=America/New_*</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -752,7 +698,7 @@
</span><span class="cx">                         <description>GET on resource - end tzid</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=*/New_York</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=*/New_York</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -767,7 +713,7 @@
</span><span class="cx">                         <description>GET on resource - contains tzid</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=*/New_*</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=*/New_*</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -782,7 +728,7 @@
</span><span class="cx">                         <description>GET on resource - starts tzid multiple</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=America/N*</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=America/N*</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -797,7 +743,7 @@
</span><span class="cx">                         <description>GET on resource - one alias</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=US/Eastern</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=US/Eastern</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -812,7 +758,7 @@
</span><span class="cx">                         <description>GET on resource - alias and tzid</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=Africa/L*</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=Africa/L*</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -833,7 +779,7 @@
</span><span class="cx">                         <description>GET on resource - contains text underscore</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=*New%20York*</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=*New%20York*</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span><span class="lines">@@ -848,7 +794,7 @@
</span><span class="cx">                         <description>GET on resource - contains text lowercase</description>
</span><span class="cx">                         <request>
</span><span class="cx">                                 <method>GET</method>
</span><del>-                                <ruri>$timezonestdservice:?action=find&amp;pattern=*new%20york*</ruri>
</del><ins>+                                <ruri>$timezonestdservice:/zones?pattern=*new%20york*</ruri>
</ins><span class="cx">                                 <verify>
</span><span class="cx">                                         <callback>jsonPointerMatch</callback>
</span><span class="cx">                                         <arg>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestsCardDAVcaldavtestdtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd (14177 => 14178)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd        2014-11-15 16:44:20 UTC (rev 14177)
+++ CalDAVTester/trunk/scripts/tests/CardDAV/caldavtest.dtd        2014-11-16 22:35:52 UTC (rev 14178)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">                 
</span><span class="cx">                 <!ELEMENT method (#PCDATA)>
</span><span class="cx">                 <!ELEMENT ruri (#PCDATA)>
</span><ins>+                        <!ATTLIST ruri quote (yes|no) "yes">
</ins><span class="cx">                 <!ELEMENT header (name, value)>
</span><span class="cx">                         <!ELEMENT name (#PCDATA)>
</span><span class="cx">                         <!ELEMENT value (#PCDATA)>
</span></span></pre></div>
<a id="CalDAVTestertrunkscriptstestspodCalDAVcaldavtestdtd"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/caldavtest.dtd (14177 => 14178)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/caldavtest.dtd        2014-11-15 16:44:20 UTC (rev 14177)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/caldavtest.dtd        2014-11-16 22:35:52 UTC (rev 14178)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">                 
</span><span class="cx">                 <!ELEMENT method (#PCDATA)>
</span><span class="cx">                 <!ELEMENT ruri (#PCDATA)>
</span><ins>+                        <!ATTLIST ruri quote (yes|no) "yes">
</ins><span class="cx">                 <!ELEMENT header (name, value)>
</span><span class="cx">                         <!ELEMENT name (#PCDATA)>
</span><span class="cx">                         <!ELEMENT value (#PCDATA)>
</span></span></pre></div>
<a id="CalDAVTestertrunksrccaldavtestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/caldavtest.py (14177 => 14178)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/caldavtest.py        2014-11-15 16:44:20 UTC (rev 14177)
+++ CalDAVTester/trunk/src/caldavtest.py        2014-11-16 22:35:52 UTC (rev 14178)
</span><span class="lines">@@ -647,7 +647,8 @@
</span><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> puri = list(urlparse.urlparse(uri))
</span><del>- puri[2] = urllib.quote(puri[2])
</del><ins>+ if req.ruri_quote:
+ puri[2] = urllib.quote(puri[2])
</ins><span class="cx"> quri = urlparse.urlunparse(puri)
</span><span class="cx">
</span><span class="cx"> http.request(method, quri, data, headers)
</span></span></pre></div>
<a id="CalDAVTestertrunksrcrequestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/request.py (14177 => 14178)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/request.py        2014-11-15 16:44:20 UTC (rev 14177)
+++ CalDAVTester/trunk/src/request.py        2014-11-16 22:35:52 UTC (rev 14178)
</span><span class="lines">@@ -157,6 +157,7 @@
</span><span class="cx"> self.headers = {}
</span><span class="cx"> self.ruris = []
</span><span class="cx"> self.ruri = ""
</span><ins>+ self.ruri_quote = True
</ins><span class="cx"> self.data = None
</span><span class="cx"> self.iterate_data = False
</span><span class="cx"> self.count = 1
</span><span class="lines">@@ -377,6 +378,7 @@
</span><span class="cx"> elif child.tag == src.xmlDefs.ELEMENT_HEADER:
</span><span class="cx"> self.parseHeader(child)
</span><span class="cx"> elif child.tag == src.xmlDefs.ELEMENT_RURI:
</span><ins>+ self.ruri_quote = child.get(src.xmlDefs.ATTR_QUOTE, src.xmlDefs.ATTR_VALUE_YES) == src.xmlDefs.ATTR_VALUE_YES
</ins><span class="cx"> self.ruris.append(self.manager.server_info.subs(child.text.encode("utf-8")))
</span><span class="cx"> if len(self.ruris) == 1:
</span><span class="cx"> self.ruri = self.ruris[0]
</span></span></pre></div>
<a id="CalDAVTestertrunksrcxmlDefspy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/xmlDefs.py (14177 => 14178)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/xmlDefs.py        2014-11-15 16:44:20 UTC (rev 14177)
+++ CalDAVTester/trunk/src/xmlDefs.py        2014-11-16 22:35:52 UTC (rev 14178)
</span><span class="lines">@@ -98,6 +98,7 @@
</span><span class="cx"> ATTR_PRINT_REQUEST = "print-request"
</span><span class="cx"> ATTR_PRINT_RESPONSE = "print-response"
</span><span class="cx"> ATTR_PSWD = "pswd"
</span><ins>+ATTR_QUOTE = "quote"
</ins><span class="cx"> ATTR_REQUEST_FAILED = "request-failed"
</span><span class="cx"> ATTR_STATS = "stats"
</span><span class="cx"> ATTR_SUBSTITUTIONS = "substitutions"
</span></span></pre>
</div>
</div>
</body>
</html>