<!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>[13824] CalDAVClientLibrary/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/13824">13824</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-08-01 18:28:43 -0700 (Fri, 01 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVClientLibrarytrunkproject">CalDAVClientLibrary/trunk/.project</a></li>
<li><a href="#CalDAVClientLibrarytrunkpydevproject">CalDAVClientLibrary/trunk/.pydevproject</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryadminxmlaccountsmanagepy">CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/manage.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsaclpy">CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/acl.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsprincipalpy">CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/principal.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryclientprincipalpy">CalDAVClientLibrary/trunk/caldavclientlibrary/client/principal.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolcaldavteststest_makecalendarpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_makecalendar.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolcaldavteststest_multigetpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_multiget.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolcarddavteststest_makeaddressbookpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/tests/test_makeaddressbook.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolcarddavteststest_multigetpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/tests/test_multiget.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolhttpteststest_requestresponsepy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_requestresponse.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolhttpteststest_utilpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_util.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolurlpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/url.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavsessionpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/session.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavteststest_lockpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavteststest_principalmatchpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_principalmatch.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavteststest_propfindpy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfind.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavteststest_propnamespy">CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propnames.py</a></li>
<li><a href="#CalDAVClientLibrarytrunkcaldavclientlibraryuiWebDAVBrowserpy">CalDAVClientLibrary/trunk/caldavclientlibrary/ui/WebDAVBrowser.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVClientLibrarytrunkproject"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/.project (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/.project 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/.project 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -1,8 +1,9 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8"?>
</span><span class="cx"> <projectDescription>
</span><del>- <name>caldavclientlibrary</name>
</del><ins>+ <name>CalDAVClientLibrary</name>
</ins><span class="cx"> <comment></comment>
</span><span class="cx"> <projects>
</span><ins>+ <project>PyKerberos</project>
</ins><span class="cx"> </projects>
</span><span class="cx"> <buildSpec>
</span><span class="cx"> <buildCommand>
</span><span class="lines">@@ -14,15 +15,4 @@
</span><span class="cx"> <natures>
</span><span class="cx"> <nature>org.python.pydev.pythonNature</nature>
</span><span class="cx"> </natures>
</span><del>- <filteredResources>
- <filter>
- <id>1395855144585</id>
- <name></name>
- <type>10</type>
- <matcher>
- <id>org.eclipse.ui.ide.multiFilter</id>
- <arguments>1.0-projectRelativePath-matches-true-false-.develop</arguments>
- </matcher>
- </filter>
- </filteredResources>
</del><span class="cx"> </projectDescription>
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkpydevproject"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/.pydevproject (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/.pydevproject 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/.pydevproject 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -1,10 +1,9 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
</span><del>-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
</del><ins>+<?eclipse-pydev version="1.0"?><pydev_project>
</ins><span class="cx"> <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
</span><span class="cx"> <path>/${PROJECT_DIR_NAME}</path>
</span><span class="cx"> </pydev_pathproperty>
</span><del>-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
</del><ins>+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
+
</ins><span class="cx"> <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
</span><span class="cx"> </pydev_project>
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryadminxmlaccountsmanagepy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/manage.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/manage.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/admin/xmlaccounts/manage.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-#import caldavclientlibrary.admin.xmlaccounts.commands
</del><ins>+# import caldavclientlibrary.admin.xmlaccounts.commands
</ins><span class="cx"> from caldavclientlibrary.admin.xmlaccounts.commands import registered
</span><span class="cx">
</span><span class="cx"> import sys
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsaclpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/acl.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/acl.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/acl.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -193,9 +193,9 @@
</span><span class="cx"> print " l. {CALDAV}schedule"
</span><span class="cx"> print " q. quit without changes"
</span><span class="cx"> choice = utils.multiChoiceInput(
</span><del>- "Select multiple items: ",
- [char for char in "abcdefghijklq"],
- )
</del><ins>+ "Select multiple items: ",
+ [char for char in "abcdefghijklq"],
+ )
</ins><span class="cx"> if "q" in choice:
</span><span class="cx"> return None
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibrarybrowsercommandsprincipalpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/principal.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/principal.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/browser/commands/principal.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -72,18 +72,18 @@
</span><span class="cx"> Calendar Addresses: %s
</span><span class="cx"> Address Book Homes: %s
</span><span class="cx"> """ % (
</span><del>- principal.principalPath,
- principal.getSmartDisplayName(),
- principal.principalURL,
- utils.printList(principal.alternateURIs),
- utils.printPrincipalPaths(self.shell.account, principal.memberset, resolve, refresh),
- utils.printPrincipalPaths(self.shell.account, principal.memberships, resolve, refresh),
- utils.printList(principal.homeset),
- principal.outboxURL,
- principal.inboxURL,
- utils.printList(principal.cuaddrs),
- utils.printList(principal.adbkhomeset),
- ),
</del><ins>+ principal.principalPath,
+ principal.getSmartDisplayName(),
+ principal.principalURL,
+ utils.printList(principal.alternateURIs),
+ utils.printPrincipalPaths(self.shell.account, principal.memberset, resolve, refresh),
+ utils.printPrincipalPaths(self.shell.account, principal.memberships, resolve, refresh),
+ utils.printList(principal.homeset),
+ principal.outboxURL,
+ principal.inboxURL,
+ utils.printList(principal.cuaddrs),
+ utils.printList(principal.adbkhomeset),
+ ),
</ins><span class="cx">
</span><span class="cx"> if print_proxies:
</span><span class="cx"> utils.printProxyPrincipals(self.shell.account, principal, True, True, resolve, False, refresh)
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryclientprincipalpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/client/principal.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/client/principal.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/client/principal.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -84,18 +84,18 @@
</span><span class="cx"> Calendar Addresses: %s
</span><span class="cx"> Address Book Homes: %s
</span><span class="cx"> """ % (
</span><del>- self.principalPath,
- self.displayname,
- self.principalURL,
- self.alternateURIs,
- self.memberset,
- self.memberships,
- self.homeset,
- self.outboxURL,
- self.inboxURL,
- self.cuaddrs,
- self.adbkhomeset,
- )
</del><ins>+ self.principalPath,
+ self.displayname,
+ self.principalURL,
+ self.alternateURIs,
+ self.memberset,
+ self.memberships,
+ self.homeset,
+ self.outboxURL,
+ self.inboxURL,
+ self.cuaddrs,
+ self.adbkhomeset,
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _initFields(self):
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolcaldavteststest_makecalendarpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_makecalendar.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_makecalendar.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_makecalendar.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -43,14 +43,15 @@
</span><span class="cx"> request = MakeCalendar(server, "/", "home")
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:mkcalendar xmlns:ns0="urn:ietf:params:xml:ns:caldav">
</span><span class="cx"> <ns1:prop xmlns:ns1="DAV:">
</span><span class="cx"> <ns1:displayname>home</ns1:displayname>
</span><span class="cx"> </ns1:prop>
</span><span class="cx"> </ns0:mkcalendar>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLMultipleProperties(self):
</span><span class="lines">@@ -59,7 +60,8 @@
</span><span class="cx"> request = MakeCalendar(server, "/", "home", "my personal calendar")
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:mkcalendar xmlns:ns0="urn:ietf:params:xml:ns:caldav">
</span><span class="cx"> <ns1:prop xmlns:ns1="DAV:">
</span><span class="cx"> <ns1:displayname>home</ns1:displayname>
</span><span class="lines">@@ -67,7 +69,7 @@
</span><span class="cx"> </ns1:prop>
</span><span class="cx"> </ns0:mkcalendar>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLCDATAProperty(self):
</span><span class="lines">@@ -99,14 +101,15 @@
</span><span class="cx"> request = MakeCalendar(server, "/", timezone=timezone)
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:mkcalendar xmlns:ns0="urn:ietf:params:xml:ns:caldav">
</span><span class="cx"> <ns1:prop xmlns:ns1="DAV:">
</span><span class="cx"> <ns0:calendar-timezone>%s</ns0:calendar-timezone>
</span><span class="cx"> </ns1:prop>
</span><span class="cx"> </ns0:mkcalendar>
</span><span class="cx"> """.replace("\n", "\r\n") % (timezone.replace("&", "&amp;"),)
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolcaldavteststest_multigetpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_multiget.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_multiget.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/caldav/tests/test_multiget.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -44,12 +44,13 @@
</span><span class="cx"> request = Multiget(server, "/", ("/a",))
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:calendar-multiget xmlns:ns0="urn:ietf:params:xml:ns:caldav">
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/a</ns1:href>
</span><span class="cx"> </ns0:calendar-multiget>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLMultipleHrefsOnly(self):
</span><span class="lines">@@ -58,13 +59,14 @@
</span><span class="cx"> request = Multiget(server, "/", ("/a", "/b",))
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:calendar-multiget xmlns:ns0="urn:ietf:params:xml:ns:caldav">
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/a</ns1:href>
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/b</ns1:href>
</span><span class="cx"> </ns0:calendar-multiget>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLMultipleHrefsOneProperty(self):
</span><span class="lines">@@ -73,7 +75,8 @@
</span><span class="cx"> request = Multiget(server, "/", ("/a", "/b",), (davxml.getetag,))
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:calendar-multiget xmlns:ns0="urn:ietf:params:xml:ns:caldav">
</span><span class="cx"> <ns1:prop xmlns:ns1="DAV:">
</span><span class="cx"> <ns1:getetag />
</span><span class="lines">@@ -82,7 +85,7 @@
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/b</ns1:href>
</span><span class="cx"> </ns0:calendar-multiget>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLMultipleHrefsMultipleProperties(self):
</span><span class="lines">@@ -91,7 +94,8 @@
</span><span class="cx"> request = Multiget(server, "/", ("/a", "/b",), (davxml.getetag, davxml.displayname,))
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:calendar-multiget xmlns:ns0="urn:ietf:params:xml:ns:caldav">
</span><span class="cx"> <ns1:prop xmlns:ns1="DAV:">
</span><span class="cx"> <ns1:getetag />
</span><span class="lines">@@ -101,7 +105,7 @@
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/b</ns1:href>
</span><span class="cx"> </ns0:calendar-multiget>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolcarddavteststest_makeaddressbookpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/tests/test_makeaddressbook.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/tests/test_makeaddressbook.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/tests/test_makeaddressbook.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -43,7 +43,8 @@
</span><span class="cx"> request = MakeAddressBook(server, "/", "home")
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:mkcol xmlns:ns0="DAV:">
</span><span class="cx"> <ns0:set>
</span><span class="cx"> <ns0:prop>
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> </ns0:set>
</span><span class="cx"> </ns0:mkcol>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLMultipleProperties(self):
</span><span class="lines">@@ -65,7 +66,8 @@
</span><span class="cx"> request = MakeAddressBook(server, "/", "home", "my personal address book")
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:mkcol xmlns:ns0="DAV:">
</span><span class="cx"> <ns0:set>
</span><span class="cx"> <ns0:prop>
</span><span class="lines">@@ -79,7 +81,7 @@
</span><span class="cx"> </ns0:set>
</span><span class="cx"> </ns0:mkcol>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolcarddavteststest_multigetpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/tests/test_multiget.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/tests/test_multiget.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/carddav/tests/test_multiget.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -44,12 +44,13 @@
</span><span class="cx"> request = Multiget(server, "/", ("/a",))
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:addressbook-multiget xmlns:ns0="urn:ietf:params:xml:ns:carddav">
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/a</ns1:href>
</span><span class="cx"> </ns0:addressbook-multiget>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLMultipleHrefsOnly(self):
</span><span class="lines">@@ -58,13 +59,14 @@
</span><span class="cx"> request = Multiget(server, "/", ("/a", "/b",))
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:addressbook-multiget xmlns:ns0="urn:ietf:params:xml:ns:carddav">
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/a</ns1:href>
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/b</ns1:href>
</span><span class="cx"> </ns0:addressbook-multiget>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLMultipleHrefsOneProperty(self):
</span><span class="lines">@@ -73,7 +75,8 @@
</span><span class="cx"> request = Multiget(server, "/", ("/a", "/b",), (davxml.getetag,))
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:addressbook-multiget xmlns:ns0="urn:ietf:params:xml:ns:carddav">
</span><span class="cx"> <ns1:prop xmlns:ns1="DAV:">
</span><span class="cx"> <ns1:getetag />
</span><span class="lines">@@ -82,7 +85,7 @@
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/b</ns1:href>
</span><span class="cx"> </ns0:addressbook-multiget>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLMultipleHrefsMultipleProperties(self):
</span><span class="lines">@@ -91,7 +94,8 @@
</span><span class="cx"> request = Multiget(server, "/", ("/a", "/b",), (davxml.getetag, davxml.displayname,))
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:addressbook-multiget xmlns:ns0="urn:ietf:params:xml:ns:carddav">
</span><span class="cx"> <ns1:prop xmlns:ns1="DAV:">
</span><span class="cx"> <ns1:getetag />
</span><span class="lines">@@ -101,7 +105,7 @@
</span><span class="cx"> <ns1:href xmlns:ns1="DAV:">/b</ns1:href>
</span><span class="cx"> </ns0:addressbook-multiget>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolhttpteststest_requestresponsepy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_requestresponse.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_requestresponse.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_requestresponse.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> Host: www.example.com
</span><span class="cx">
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_EtagMatch(self):
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> If-Match: "etag"
</span><span class="cx">
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_EtagNoneMatch(self):
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> If-None-Match: "etag"
</span><span class="cx">
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_Content(self):
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> Content-Type: text/plain
</span><span class="cx">
</span><span class="cx"> """.replace("\n", "\r\n") % (len(rawdata),)
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_ContentAndAuthorization(self):
</span><span class="lines">@@ -90,4 +90,4 @@
</span><span class="cx"> Content-Type: text/plain
</span><span class="cx">
</span><span class="cx"> """.replace("\n", "\r\n") % (len(rawdata),)
</span><del>-)
</del><ins>+ )
</ins></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolhttpteststest_utilpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_util.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_util.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/http/tests/test_util.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> "\"unterminated" : ("unterminated", ""),
</span><span class="cx"> "\"unterminated words" : ("unterminated words", ""),
</span><span class="cx"> "\"unterminated a \\\"word\\\"" : ("unterminated a \"word\"", ""),
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> for input, result in data.iteritems():
</span><span class="cx"> self.assertEqual(parsequoted(input), result)
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolurlpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/url.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/url.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/url.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> URLXCharacter = (# Allowable URL chars (all)
</span><del>- # RFC2732 uses '[...]' for IPv6 addressing - [] are now allowed
</del><ins>+ # RFC2732 uses '[...]' for IPv6 addressing - [] are now allowed
</ins><span class="cx"> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # 0 - 15
</span><span class="cx"> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, # 16 - 31
</span><span class="cx"> 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, # 32 - 47
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavsessionpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/session.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/session.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/session.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -97,9 +97,11 @@
</span><span class="cx"> capa = ""
</span><span class="cx"> for name, value in request.getResponseHeaders().iteritems():
</span><span class="cx">
</span><del>- if (not name.lower().startswith(headers.Server) and
</del><ins>+ if (
+ not name.lower().startswith(headers.Server) and
</ins><span class="cx"> not name.lower().startswith(headers.Date) and
</span><del>- name.lower().startswith("Content-")):
</del><ins>+ name.lower().startswith("Content-")
+ ):
</ins><span class="cx">
</span><span class="cx"> capa += "%s: %s\n" % (name, value,)
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavteststest_lockpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_lock.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -99,7 +99,8 @@
</span><span class="cx"> request = Lock(server, "/", headers.Depth0, Lock.eExclusive, "user@example.com", -1)
</span><span class="cx"> os = StringIO()
</span><span class="cx"> request.generateXML(os)
</span><del>- self.assertEqual(os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</del><ins>+ self.assertEqual(
+ os.getvalue(), """<?xml version='1.0' encoding='utf-8'?>
</ins><span class="cx"> <ns0:lockinfo xmlns:ns0="DAV:">
</span><span class="cx"> <ns0:lockscope>
</span><span class="cx"> <ns0:exclusive />
</span><span class="lines">@@ -110,7 +111,7 @@
</span><span class="cx"> <ns0:owner>user@example.com</ns0:owner>
</span><span class="cx"> </ns0:lockinfo>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavteststest_principalmatchpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_principalmatch.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_principalmatch.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_principalmatch.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> </ns0:prop>
</span><span class="cx"> </ns0:principal-match>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_GenerateXMLMultipleProperties(self):
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> </ns0:prop>
</span><span class="cx"> </ns0:principal-match>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavteststest_propfindpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfind.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfind.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propfind.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> </ns0:prop>
</span><span class="cx"> </ns0:propfind>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryprotocolwebdavteststest_propnamespy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propnames.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propnames.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/protocol/webdav/tests/test_propnames.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> <ns0:propname />
</span><span class="cx"> </ns0:propfind>
</span><span class="cx"> """.replace("\n", "\r\n")
</span><del>-)
</del><ins>+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVClientLibrarytrunkcaldavclientlibraryuiWebDAVBrowserpy"></a>
<div class="modfile"><h4>Modified: CalDAVClientLibrary/trunk/caldavclientlibrary/ui/WebDAVBrowser.py (13823 => 13824)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVClientLibrary/trunk/caldavclientlibrary/ui/WebDAVBrowser.py 2014-08-02 01:00:22 UTC (rev 13823)
+++ CalDAVClientLibrary/trunk/caldavclientlibrary/ui/WebDAVBrowser.py 2014-08-02 01:28:43 UTC (rev 13824)
</span><span class="lines">@@ -177,8 +177,8 @@
</span><span class="cx">
</span><span class="cx"> DATAVIEW_PROPERTIES = 0
</span><span class="cx"> DATAVIEW_DATA = 1
</span><del>- #DATAVIEW_DELEGATES = 2
- #DATAVIEW_ACLS = 3
</del><ins>+ # DATAVIEW_DELEGATES = 2
+ # DATAVIEW_ACLS = 3
</ins><span class="cx">
</span><span class="cx"> selectedDetails = None
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>