<!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>[13587] PyCalendar/trunk/src/zonal</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/13587">13587</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-05-31 19:08:50 -0700 (Sat, 31 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix tz functions to catch up to api changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyCalendartrunksrczonaltzdumppy">PyCalendar/trunk/src/zonal/tzdump.py</a></li>
<li><a href="#PyCalendartrunksrczonaltzverifypy">PyCalendar/trunk/src/zonal/tzverify.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyCalendartrunksrczonaltzdumppy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/zonal/tzdump.py (13586 => 13587)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/zonal/tzdump.py 2014-06-01 01:06:08 UTC (rev 13586)
+++ PyCalendar/trunk/src/zonal/tzdump.py 2014-06-01 02:08:50 UTC (rev 13587)
</span><span class="lines">@@ -46,14 +46,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+def sortedList(setdata):
+ l = list(setdata)
+ l.sort(cmp=lambda x, y: DateTime.sort(x[0], y[0]))
+ return l
+
+
+
</ins><span class="cx"> def formattedExpandedDates(expanded):
</span><del>- items = []
- for item in expanded:
- utc = item[0].duplicate()
- utc.setTimezoneUTC(True)
- utc.offsetSeconds(-item[1])
- items.append((item[0], utc, secondsToTime(item[1]), secondsToTime(item[2]),))
- return "\n".join(["(%s, %s, %s, %s)" % item for item in items])
</del><ins>+ items = sortedList([(item[0], item[1], secondsToTime(item[2]), secondsToTime(item[3]),) for item in expanded])
+ return ", ".join(["(%s, %s, %s, %s)" % item for item in items])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="PyCalendartrunksrczonaltzverifypy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/zonal/tzverify.py (13586 => 13587)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/zonal/tzverify.py 2014-06-01 01:06:08 UTC (rev 13586)
+++ PyCalendar/trunk/src/zonal/tzverify.py 2014-06-01 02:08:50 UTC (rev 13587)
</span><span class="lines">@@ -22,8 +22,9 @@
</span><span class="cx"> import getopt
</span><span class="cx"> import os
</span><span class="cx"> import sys
</span><ins>+from pycalendar.icalendar import definitions
</ins><span class="cx">
</span><del>-def loadCalendarFromZoneinfo(zoneinfopath, skips=(), verbose=False, quiet=False):
</del><ins>+def loadCalendarFromZoneinfo(zoneinfopath, skips=(), only=(), verbose=False, quiet=False):
</ins><span class="cx">
</span><span class="cx"> if not quiet:
</span><span class="cx"> print "Scanning for calendar data in: %s" % (zoneinfopath,)
</span><span class="lines">@@ -34,13 +35,20 @@
</span><span class="cx"> if os.path.isdir(fpath):
</span><span class="cx"> scanForICS(fpath)
</span><span class="cx"> elif fname.endswith(".ics"):
</span><del>- for skip in skips:
- if skip in fpath:
- break
</del><ins>+ if only:
+ for item in only:
+ if item in fpath:
+ if verbose:
+ print "Found calendar data: %s" % (fpath,)
+ paths.append(fpath)
</ins><span class="cx"> else:
</span><del>- if verbose:
- print "Found calendar data: %s" % (fpath,)
- paths.append(fpath)
</del><ins>+ for skip in skips:
+ if skip in fpath:
+ break
+ else:
+ if verbose:
+ print "Found calendar data: %s" % (fpath,)
+ paths.append(fpath)
</ins><span class="cx"> scanForICS(zoneinfopath)
</span><span class="cx">
</span><span class="cx"> if not quiet:
</span><span class="lines">@@ -109,9 +117,9 @@
</span><span class="cx"> missing = tzids1.difference(tzids2)
</span><span class="cx"> if missing:
</span><span class="cx"> print """TZIDs in calendar 1 not in calendar 2 files: %s
</span><del>-These cannot be checked.""" % (", ".join(missing),)
</del><ins>+These cannot be checked.""" % (", ".join(sorted(missing)),)
</ins><span class="cx">
</span><del>- for tzid in tzids1.intersection(tzids2):
</del><ins>+ for tzid in sorted(tzids1.intersection(tzids2)):
</ins><span class="cx"> if filterTzids and tzid not in filterTzids:
</span><span class="cx"> continue
</span><span class="cx"> if not quiet:
</span><span class="lines">@@ -128,11 +136,11 @@
</span><span class="cx"> if i[0] == start:
</span><span class="cx"> d1.discard(i)
</span><span class="cx"> break
</span><del>- if i[1] == i[2]:
</del><ins>+ if i[2] == i[3]:
</ins><span class="cx"> d1.discard(i)
</span><span class="cx"> d2 = set2.difference(set1)
</span><span class="cx"> for i in set(d2):
</span><del>- if i[1] == i[2]:
</del><ins>+ if i[2] == i[3]:
</ins><span class="cx"> d2.discard(i)
</span><span class="cx"> if d1:
</span><span class="cx"> print "In calendar 1 but not in calendar 2 tzid=%s: %s" % (tzid, formattedExpandedDates(d1),)
</span><span class="lines">@@ -146,8 +154,7 @@
</span><span class="cx"> def getTZIDs(cal):
</span><span class="cx"> results = set()
</span><span class="cx">
</span><del>- db = cal.getVTimezoneDB()
- for vtz in db:
</del><ins>+ for vtz in cal.getComponents(definitions.cICalComponent_VTIMEZONE):
</ins><span class="cx"> tzid = vtz.getID()
</span><span class="cx"> results.add(tzid)
</span><span class="cx">
</span><span class="lines">@@ -157,8 +164,7 @@
</span><span class="cx">
</span><span class="cx"> def getExpandedDates(cal, tzid, start, end):
</span><span class="cx">
</span><del>- db = cal.getVTimezoneDB()
- return db[tzid].expandAll(start, end)
</del><ins>+ return cal.getTimezone(tzid).expandAll(start, end)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -170,8 +176,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def formattedExpandedDates(expanded):
</span><del>- items = sortedList([(item[0], secondsToTime(item[1]), secondsToTime(item[2]),) for item in expanded])
- return ", ".join(["(%s, %s, %s)" % item for item in items])
</del><ins>+ items = sortedList([(item[0], item[1], secondsToTime(item[2]), secondsToTime(item[3]),) for item in expanded])
+ return ", ".join(["(%s, %s, %s, %s)" % item for item in items])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -267,9 +273,13 @@
</span><span class="cx"> #"Africa/Cairo",
</span><span class="cx"> )
</span><span class="cx">
</span><del>- checkcalendar1 = loadCalendarFromZoneinfo(zonedir1, skips, verbose, quiet)
- checkcalendar2 = loadCalendarFromZoneinfo(zonedir2, skips, verbose, quiet)
</del><ins>+ only = (
+ #"Europe/Lisbon",
+ )
</ins><span class="cx">
</span><ins>+ checkcalendar1 = loadCalendarFromZoneinfo(zonedir1, skips, only, verbose, quiet)
+ checkcalendar2 = loadCalendarFromZoneinfo(zonedir2, skips, only, verbose, quiet)
+
</ins><span class="cx"> compareCalendars(
</span><span class="cx"> checkcalendar1,
</span><span class="cx"> checkcalendar2,
</span></span></pre>
</div>
</div>
</body>
</html>