<!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>[13689] PyCalendar/trunk/src/pycalendar</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/13689">13689</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-25 11:47:12 -0700 (Wed, 25 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Performance improvements.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyCalendartrunksrcpycalendarstringutilspy">PyCalendar/trunk/src/pycalendar/stringutils.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendarutilspy">PyCalendar/trunk/src/pycalendar/utils.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#PyCalendartrunksrcpycalendarteststest_stringutilspy">PyCalendar/trunk/src/pycalendar/tests/test_stringutils.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyCalendartrunksrcpycalendarstringutilspy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/stringutils.py (13688 => 13689)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/stringutils.py        2014-06-25 18:45:45 UTC (rev 13688)
+++ PyCalendar/trunk/src/pycalendar/stringutils.py        2014-06-25 18:47:12 UTC (rev 13689)
</span><span class="lines">@@ -18,51 +18,31 @@
</span><span class="cx">
</span><span class="cx"> def strduptokenstr(txt, tokens):
</span><span class="cx">
</span><del>- result = None
- start = 0
</del><ins>+ # First punt over any leading space - this is not common so test the
+ # first character before trying the more expensive strip
+ if txt[0] == " ":
+ txt = txt.lstrip()
+ if not txt:
+ return None, ""
</ins><span class="cx">
</span><del>- # First punt over any leading space
- for s in txt:
- if s == " ":
- start += 1
- else:
- break
- else:
- return None, ""
-
</del><span class="cx"> # Handle quoted string
</span><del>- if txt[start] == '\"':
-
- maxlen = len(txt)
- # Punt leading quote
- start += 1
- end = start
-
- done = False
- while not done:
- if end == maxlen:
- return None, txt
-
- if txt[end] == '\"':
- done = True
- elif txt[end] == '\\':
- # Punt past quote
- end += 2
</del><ins>+ if txt[0] == '\"':
+ skip = False
+ for end, s in enumerate(txt[1:]):
+ if skip:
+ skip = False
+ continue
+ elif s == '\"':
+ return txt[1:end + 1], txt[end + 2:]
</ins><span class="cx"> else:
</span><del>- end += 1
- if end >= maxlen:
- return None, txt
-
- return txt[start:end], txt[end + 1:]
</del><ins>+ skip = (s == '\\')
+ else:
+ return None, txt
</ins><span class="cx"> else:
</span><del>- for relend, s in enumerate(txt[start:]):
</del><ins>+ for end, s in enumerate(txt):
</ins><span class="cx"> if s in tokens:
</span><del>- if relend:
- result = txt[start:start + relend]
- else:
- result = ""
- return result, txt[start + relend:]
- return txt[start:], ""
</del><ins>+ return txt[0:end], txt[end:]
+ return txt, ""
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendarteststest_stringutilspy"></a>
<div class="addfile"><h4>Added: PyCalendar/trunk/src/pycalendar/tests/test_stringutils.py (0 => 13689)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/tests/test_stringutils.py         (rev 0)
+++ PyCalendar/trunk/src/pycalendar/tests/test_stringutils.py        2014-06-25 18:47:12 UTC (rev 13689)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+##
+# Copyright (c) 2012-2013 Cyrus Daboo. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+import unittest
+from pycalendar.stringutils import strduptokenstr
+
+class TestStringUtils(unittest.TestCase):
+
+ def test_strduptokenstr(self):
+ """
+ Make sure L{strduptokenstr} copes with all possibilities.
+ """
+
+ data = (
+ # Leading space
+ (" abc:def", ":;", ("abc", ":def")),
+ (" \"abc\":def", ":;", ("abc", ":def")),
+ (" ", ":;", (None, "")),
+
+ # Quoted
+ ("\"abc\":def", ":;", ("abc", ":def")),
+ ("\"ab\\c\":def", ":;", ("ab\\c", ":def")),
+ ("\"ab\\c:def", ":;", (None, "\"ab\\c:def")),
+ ("\"abc\":", ":;", ("abc", ":")),
+ ("\"abc\"", ":;", ("abc", "")),
+
+ # Unuoted
+ ("abc:def", ":;", ("abc", ":def")),
+ ("abc:", ":;", ("abc", ":")),
+ ("abc", ":;", ("abc", "")),
+ )
+
+ for txt, tokens, result in data:
+ self.assertEqual(strduptokenstr(txt, tokens), result)
</ins></span></pre></div>
<a id="PyCalendartrunksrcpycalendarutilspy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/utils.py (13688 => 13689)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/utils.py        2014-06-25 18:45:45 UTC (rev 13688)
+++ PyCalendar/trunk/src/pycalendar/utils.py        2014-06-25 18:47:12 UTC (rev 13689)
</span><span class="lines">@@ -201,57 +201,67 @@
</span><span class="cx"> RFC6868 parameter encoding.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- encoded = []
- last = ''
- for c in value:
- if c == '\r':
- encoded.append('^')
- encoded.append('n')
- elif c == '\n':
- if last != '\r':
- encoded.append('^')
- encoded.append('n')
- elif c == '"':
- encoded.append('^')
- encoded.append('\'')
- elif c == '^':
- encoded.append('^')
- encoded.append('^')
- else:
- encoded.append(c)
- last = c
</del><ins>+ # Test for encoded characters first as encoding is expensive and it is better to
+ # avoid doing it if it is not required (which is the common case)
+ encode = False
+ for c in "\r\n\"^":
+ if c in value:
+ encode = True
</ins><span class="cx">
</span><del>- return "".join(encoded)
</del><ins>+ if encode:
+ encoded = []
+ last = ''
+ for c in value:
+ if c in "\r\n\"^":
+ if c == '\r':
+ encoded.append("^n")
+ elif c == '\n':
+ if last != '\r':
+ encoded.append("^n")
+ elif c == '"':
+ encoded.append("^'")
+ elif c == '^':
+ encoded.append("^^")
+ else:
+ encoded.append(c)
+ last = c
</ins><span class="cx">
</span><ins>+ return "".join(encoded)
+ else:
+ return value
</ins><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def decodeParameterValue(value):
</span><span class="cx"> """
</span><span class="cx"> RFC6868 parameter decoding.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- if value is None:
- return None
- decoded = []
- last = ''
- for c in value:
</del><ins>+ # Test for encoded characters first as decoding is expensive and it is better to
+ # avoid doing it if it is not required (which is the common case)
+ if value is not None and "^" in value:
+ decoded = []
+ last = ''
+ for c in value:
+ if last == '^':
+ if c == 'n':
+ decoded.append('\n')
+ elif c == '\'':
+ decoded.append('"')
+ elif c == '^':
+ decoded.append('^')
+ c = ''
+ else:
+ decoded.append('^')
+ decoded.append(c)
+ elif c != '^':
+ decoded.append(c)
+ last = c
</ins><span class="cx"> if last == '^':
</span><del>- if c == 'n':
- decoded.append('\n')
- elif c == '\'':
- decoded.append('"')
- elif c == '^':
- decoded.append('^')
- c = ''
- else:
- decoded.append('^')
- decoded.append(c)
- elif c != '^':
- decoded.append(c)
- last = c
- if last == '^':
- decoded.append('^')
- return "".join(decoded)
</del><ins>+ decoded.append('^')
+ return "".join(decoded)
+ else:
+ return value
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>