<!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>[12721] PyCalendar/branches/CalendarServer-5.2</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/12721">12721</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-02-19 11:56:40 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Be tolerant of leading spaces instead of zeros in date values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyCalendarbranchesCalendarServer52pydevproject">PyCalendar/branches/CalendarServer-5.2/.pydevproject</a></li>
<li><a href="#PyCalendarbranchesCalendarServer52srcpycalendardatetimepy">PyCalendar/branches/CalendarServer-5.2/src/pycalendar/datetime.py</a></li>
<li><a href="#PyCalendarbranchesCalendarServer52srcpycalendarparserpy">PyCalendar/branches/CalendarServer-5.2/src/pycalendar/parser.py</a></li>
<li><a href="#PyCalendarbranchesCalendarServer52srcpycalendarteststest_datetimepy">PyCalendar/branches/CalendarServer-5.2/src/pycalendar/tests/test_datetime.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyCalendarbranchesCalendarServer52pydevproject"></a>
<div class="modfile"><h4>Modified: PyCalendar/branches/CalendarServer-5.2/.pydevproject (12720 => 12721)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/branches/CalendarServer-5.2/.pydevproject 2014-02-19 18:57:38 UTC (rev 12720)
+++ PyCalendar/branches/CalendarServer-5.2/.pydevproject 2014-02-19 19:56:40 UTC (rev 12721)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
</span><span class="cx"> <?eclipse-pydev version="1.0"?><pydev_project>
</span><del>-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
</del><ins>+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
</ins><span class="cx"> <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
</span><span class="cx"> <path>/${PROJECT_DIR_NAME}/src</path>
</span><span class="cx"> </pydev_pathproperty>
</span></span></pre></div>
<a id="PyCalendarbranchesCalendarServer52srcpycalendardatetimepy"></a>
<div class="modfile"><h4>Modified: PyCalendar/branches/CalendarServer-5.2/src/pycalendar/datetime.py (12720 => 12721)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/branches/CalendarServer-5.2/src/pycalendar/datetime.py 2014-02-19 18:57:38 UTC (rev 12720)
+++ PyCalendar/branches/CalendarServer-5.2/src/pycalendar/datetime.py 2014-02-19 19:56:40 UTC (rev 12721)
</span><span class="lines">@@ -19,6 +19,7 @@
</span><span class="cx"> from pycalendar import utils
</span><span class="cx"> from pycalendar import xmldefs
</span><span class="cx"> from pycalendar.duration import PyCalendarDuration
</span><ins>+from pycalendar.parser import ParserContext
</ins><span class="cx"> from pycalendar.timezone import PyCalendarTimezone
</span><span class="cx"> from pycalendar.valueutils import ValueMixin
</span><span class="cx"> import cStringIO as StringIO
</span><span class="lines">@@ -960,7 +961,7 @@
</span><span class="cx"> self.mDay = int(data[index:index + 2])
</span><span class="cx"> index += 2
</span><span class="cx">
</span><del>- if ' ' in data[:index]:
</del><ins>+ if ' ' in data[:index] and ParserContext.INVALID_DATETIME_LEADINGSPACE == ParserContext.PARSER_RAISE:
</ins><span class="cx"> raise ValueError
</span><span class="cx"> if self.mYear < 0 or self.mMonth < 0 or self.mDay < 0:
</span><span class="cx"> raise ValueError
</span></span></pre></div>
<a id="PyCalendarbranchesCalendarServer52srcpycalendarparserpy"></a>
<div class="modfile"><h4>Modified: PyCalendar/branches/CalendarServer-5.2/src/pycalendar/parser.py (12720 => 12721)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/branches/CalendarServer-5.2/src/pycalendar/parser.py 2014-02-19 18:57:38 UTC (rev 12720)
+++ PyCalendar/branches/CalendarServer-5.2/src/pycalendar/parser.py 2014-02-19 19:56:40 UTC (rev 12721)
</span><span class="lines">@@ -46,6 +46,9 @@
</span><span class="cx"> # Allow DATE values when DATETIME specified (and vice versa)
</span><span class="cx"> INVALID_DATETIME_VALUE = PARSER_FIX
</span><span class="cx">
</span><ins>+ # Allow leading space instead of leading zeros for year in DATE or DATE-TIME values
+ INVALID_DATETIME_LEADINGSPACE = PARSER_ALLOW
+
</ins><span class="cx"> # Allow slightly invalid DURATION values
</span><span class="cx"> INVALID_DURATION_VALUE = PARSER_FIX
</span><span class="cx">
</span></span></pre></div>
<a id="PyCalendarbranchesCalendarServer52srcpycalendarteststest_datetimepy"></a>
<div class="modfile"><h4>Modified: PyCalendar/branches/CalendarServer-5.2/src/pycalendar/tests/test_datetime.py (12720 => 12721)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/branches/CalendarServer-5.2/src/pycalendar/tests/test_datetime.py 2014-02-19 18:57:38 UTC (rev 12720)
+++ PyCalendar/branches/CalendarServer-5.2/src/pycalendar/tests/test_datetime.py 2014-02-19 19:56:40 UTC (rev 12721)
</span><span class="lines">@@ -16,11 +16,20 @@
</span><span class="cx">
</span><span class="cx"> from pycalendar.calendar import PyCalendar
</span><span class="cx"> from pycalendar.datetime import PyCalendarDateTime
</span><ins>+from pycalendar.parser import ParserContext
</ins><span class="cx"> from pycalendar.timezone import PyCalendarTimezone
</span><span class="cx"> import unittest
</span><span class="cx">
</span><span class="cx"> class TestDateTime(unittest.TestCase):
</span><span class="cx">
</span><ins>+ def _patch(self, obj, attr, value):
+ oldvalue = getattr(obj, attr)
+ setattr(obj, attr, value)
+ def _restore():
+ setattr(obj, attr, oldvalue)
+ self.addCleanup(_restore)
+
+
</ins><span class="cx"> def testDuplicateASUTC(self):
</span><span class="cx">
</span><span class="cx"> items = (
</span><span class="lines">@@ -95,6 +104,8 @@
</span><span class="cx">
</span><span class="cx"> def testBadParse(self):
</span><span class="cx">
</span><ins>+ self._patch(ParserContext, "INVALID_DATETIME_LEADINGSPACE", ParserContext.PARSER_RAISE)
+
</ins><span class="cx"> data1 = (
</span><span class="cx"> "2011",
</span><span class="cx"> "201101023",
</span><span class="lines">@@ -128,6 +139,24 @@
</span><span class="cx"> self.assertRaises(ValueError, PyCalendarDateTime.parseText, item, False)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def testBadParseFixed(self):
+
+ self._patch(ParserContext, "INVALID_DATETIME_LEADINGSPACE", ParserContext.PARSER_ALLOW)
+
+ data = (
+ (" 10102", "00010102"),
+ ("2001 102", "20010102"),
+ ("200101 2", "20010102"),
+ (" 10102T010101", "00010102T010101"),
+ ("2001 102T010101", "20010102T010101"),
+ ("200101 2T010101", "20010102T010101"),
+ )
+
+ for item, result in data:
+ dt = PyCalendarDateTime.parseText(item)
+ self.assertEqual(str(dt), result)
+
+
</ins><span class="cx"> def testCachePreserveOnAdjustment(self):
</span><span class="cx">
</span><span class="cx"> # UTC first
</span></span></pre>
</div>
</div>
</body>
</html>