[CalendarServer-changes] [13366] CalendarServer/trunk/twistedcaldav/ical.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Apr 23 21:27:28 PDT 2014
Revision: 13366
http://trac.calendarserver.org//changeset/13366
Author: gaya at apple.com
Date: 2014-04-23 21:27:28 -0700 (Wed, 23 Apr 2014)
Log Message:
-----------
revert changes to normalize_iCalStr() & diff_iCalStrs()
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/ical.py
Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py 2014-04-24 03:14:22 UTC (rev 13365)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-04-24 04:27:28 UTC (rev 13366)
@@ -3777,15 +3777,13 @@
pos = line.find(";X-CALENDARSERVER-DTSTAMP=")
if pos != -1:
lines[ctr] = line[:pos] + line[pos + len(";X-CALENDARSERVER-DTSTAMP=") + 16:]
- icalstr = "\r\n".join(lines) + "\r\n"
+ icalstr = "\r\n".join(lines)
+ return icalstr + "\r\n"
- return str(Component.fromString(icalstr))
-
def diff_iCalStrs(icalstr1, icalstr2):
- """
- """
+
icalstr1 = normalize_iCalStr(icalstr1).splitlines()
icalstr2 = normalize_iCalStr(icalstr2).splitlines()
return "\n".join(unified_diff(icalstr1, icalstr2))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140423/c4438d71/attachment.html>
More information about the calendarserver-changes
mailing list