<!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>[14915] PyCalendar/trunk/src</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/14915">14915</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-25 14:49:45 -0700 (Thu, 25 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix JSON unicode encoding issues. Fix PyPy open files issue.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyCalendartrunksrcpycalendaricalendarcalendarpy">PyCalendar/trunk/src/pycalendar/icalendar/calendar.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendaricalendarrequeststatusvaluepy">PyCalendar/trunk/src/pycalendar/icalendar/requeststatusvalue.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendaricalendarteststest_jsonpy">PyCalendar/trunk/src/pycalendar/icalendar/tests/test_json.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendarplaintextvaluepy">PyCalendar/trunk/src/pycalendar/plaintextvalue.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendarpropertypy">PyCalendar/trunk/src/pycalendar/property.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendartimezonedbpy">PyCalendar/trunk/src/pycalendar/timezonedb.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendarvalidatorpy">PyCalendar/trunk/src/pycalendar/validator.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendarvcardadrpy">PyCalendar/trunk/src/pycalendar/vcard/adr.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendarvcardnpy">PyCalendar/trunk/src/pycalendar/vcard/n.py</a></li>
<li><a href="#PyCalendartrunksrcpycalendarvcardorgvaluepy">PyCalendar/trunk/src/pycalendar/vcard/orgvalue.py</a></li>
<li><a href="#PyCalendartrunksrczonaltzconvertpy">PyCalendar/trunk/src/zonal/tzconvert.py</a></li>
<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="PyCalendartrunksrcpycalendaricalendarcalendarpy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/icalendar/calendar.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/icalendar/calendar.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/icalendar/calendar.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -456,10 +456,10 @@
</span><span class="cx"> return root
</span><span class="cx">
</span><span class="cx">
</span><del>- def getTextJSON(self, includeTimezones=None):
</del><ins>+ def getTextJSON(self, includeTimezones=None, sort_keys=False):
</ins><span class="cx"> jobject = []
</span><span class="cx"> self.writeJSON(jobject, includeTimezones)
</span><del>- return json.dumps(jobject[0], indent=2, separators=(',', ':'))
</del><ins>+ return json.dumps(jobject[0], indent=2, separators=(',', ':'), sort_keys=sort_keys)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def writeJSON(self, jobject, includeTimezones=None):
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendaricalendarrequeststatusvaluepy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/icalendar/requeststatusvalue.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/icalendar/requeststatusvalue.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/icalendar/requeststatusvalue.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def parseJSONValue(self, jobject):
</span><del>- self.mValue = jobject
</del><ins>+ self.mValue = map(lambda x: x.encode("utf-8"), jobject)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def writeJSONValue(self, jobject):
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendaricalendarteststest_jsonpy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/icalendar/tests/test_json.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/icalendar/tests/test_json.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/icalendar/tests/test_json.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> from pycalendar.icalendar.property import Property
</span><span class="cx"> import difflib
</span><span class="cx"> import unittest
</span><ins>+import json
</ins><span class="cx">
</span><span class="cx"> class TestJSON(unittest.TestCase):
</span><span class="cx">
</span><span class="lines">@@ -387,14 +388,380 @@
</span><span class="cx"> ),
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ i18ndata = (
+ (
+ """BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Example Inc.//Example Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20080205T191224Z
+DTSTART;VALUE=DATE:20081006
+SUMMARY:Planning meeting å
+UID:4088E990AD89CB3DBB484909
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n"),
+
+ """[
+ "vcalendar",
+ [
+ [
+ "version",
+ {},
+ "text",
+ "2.0"
+ ],
+ [
+ "calscale",
+ {},
+ "text",
+ "GREGORIAN"
+ ],
+ [
+ "prodid",
+ {},
+ "text",
+ "-//Example Inc.//Example Calendar//EN"
+ ]
+ ],
+ [
+ [
+ "vevent",
+ [
+ [
+ "uid",
+ {},
+ "text",
+ "4088E990AD89CB3DBB484909"
+ ],
+ [
+ "dtstart",
+ {},
+ "date",
+ "2008-10-06"
+ ],
+ [
+ "dtstamp",
+ {},
+ "date-time",
+ "2008-02-05T19:12:24Z"
+ ],
+ [
+ "summary",
+ {},
+ "text",
+ "Planning meeting å"
+ ]
+ ],
+ []
+ ]
+ ]
+]""",
+ ),
+ (
+ """BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Example Corp.//Example Client//EN
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:US/Eastern
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:EDT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+TZNAME:EST
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20060206T001121Z
+DTSTART;TZID=US/Eastern:20060102T120000
+DURATION:PT1H
+GEO:-123.45;67.89
+RRULE:FREQ=DAILY;COUNT=5
+RDATE;TZID=US/Eastern;VALUE=PERIOD:20060102T150000/PT2H
+SUMMARY:Event #2 å
+DESCRIPTION:We are having a meeting all this week at 12 pm fo
+ r one hour\\, with an additional meeting on the first day 2 h
+ ours long.\\nPlease bring your own lunch for the 12 pm meetin
+ gs.
+UID:00959BC664CA650E933C892C@example.com
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20060206T001121Z
+DTSTART;TZID=US/Eastern:20060104T140000
+DURATION:PT1H
+RECURRENCE-ID;TZID=US/Eastern:20060104T120000
+SUMMARY:Event #2 bis å
+UID:00959BC664CA650E933C892C@example.com
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n"),
+
+ """[
+ "vcalendar",
+ [
+ [
+ "version",
+ {},
+ "text",
+ "2.0"
+ ],
+ [
+ "prodid",
+ {},
+ "text",
+ "-//Example Corp.//Example Client//EN"
+ ]
+ ],
+ [
+ [
+ "vtimezone",
+ [
+ [
+ "tzid",
+ {},
+ "text",
+ "US/Eastern"
+ ],
+ [
+ "last-modified",
+ {},
+ "date-time",
+ "2004-01-10T03:28:45Z"
+ ]
+ ],
+ [
+ [
+ "daylight",
+ [
+ [
+ "dtstart",
+ {},
+ "date-time",
+ "2000-04-04T02:00:00"
+ ],
+ [
+ "rrule",
+ {},
+ "recur",
+ {
+ "bymonth":[
+ 4
+ ],
+ "freq":"YEARLY",
+ "byday":[
+ "1SU"
+ ]
+ }
+ ],
+ [
+ "tzname",
+ {},
+ "text",
+ "EDT"
+ ],
+ [
+ "tzoffsetfrom",
+ {},
+ "utc-offset",
+ "-05:00"
+ ],
+ [
+ "tzoffsetto",
+ {},
+ "utc-offset",
+ "-04:00"
+ ]
+ ],
+ []
+ ],
+ [
+ "standard",
+ [
+ [
+ "dtstart",
+ {},
+ "date-time",
+ "2000-10-26T02:00:00"
+ ],
+ [
+ "rrule",
+ {},
+ "recur",
+ {
+ "bymonth":[
+ 10
+ ],
+ "freq":"YEARLY",
+ "byday":[
+ "-1SU"
+ ]
+ }
+ ],
+ [
+ "tzname",
+ {},
+ "text",
+ "EST"
+ ],
+ [
+ "tzoffsetfrom",
+ {},
+ "utc-offset",
+ "-04:00"
+ ],
+ [
+ "tzoffsetto",
+ {},
+ "utc-offset",
+ "-05:00"
+ ]
+ ],
+ []
+ ]
+ ]
+ ],
+ [
+ "vevent",
+ [
+ [
+ "uid",
+ {},
+ "text",
+ "00959BC664CA650E933C892C@example.com"
+ ],
+ [
+ "dtstart",
+ {
+ "tzid":"US/Eastern"
+ },
+ "date-time",
+ "2006-01-02T12:00:00"
+ ],
+ [
+ "duration",
+ {},
+ "duration",
+ "PT1H"
+ ],
+ [
+ "description",
+ {},
+ "text",
+ "We are having a meeting all this week at 12 pm for one hour, with an additional meeting on the first day 2 hours long.\\nPlease bring your own lunch for the 12 pm meetings."
+ ],
+ [
+ "dtstamp",
+ {},
+ "date-time",
+ "2006-02-06T00:11:21Z"
+ ],
+ [
+ "geo",
+ {},
+ "float",
+ [
+ -123.45,
+ 67.89
+ ]
+ ],
+ [
+ "rdate",
+ {
+ "tzid":"US/Eastern"
+ },
+ "period",
+ [
+ "2006-01-02T15:00:00",
+ "PT2H"
+ ]
+ ],
+ [
+ "rrule",
+ {},
+ "recur",
+ {
+ "count":5,
+ "freq":"DAILY"
+ }
+ ],
+ [
+ "summary",
+ {},
+ "text",
+ "Event #2 å"
+ ]
+ ],
+ []
+ ],
+ [
+ "vevent",
+ [
+ [
+ "uid",
+ {},
+ "text",
+ "00959BC664CA650E933C892C@example.com"
+ ],
+ [
+ "recurrence-id",
+ {
+ "tzid":"US/Eastern"
+ },
+ "date-time",
+ "2006-01-04T12:00:00"
+ ],
+ [
+ "dtstart",
+ {
+ "tzid":"US/Eastern"
+ },
+ "date-time",
+ "2006-01-04T14:00:00"
+ ],
+ [
+ "duration",
+ {},
+ "duration",
+ "PT1H"
+ ],
+ [
+ "dtstamp",
+ {},
+ "date-time",
+ "2006-02-06T00:11:21Z"
+ ],
+ [
+ "summary",
+ {},
+ "text",
+ "Event #2 bis å"
+ ]
+ ],
+ []
+ ]
+ ]
+]""",
+ ),
+ )
+
</ins><span class="cx"> def testGenerateJSON(self):
</span><span class="cx">
</span><span class="cx"> def _doRoundtrip(caldata, resultdata):
</span><del>- test1 = resultdata
</del><ins>+ test1 = json.dumps(json.loads(resultdata), indent=2, separators=(',', ':'), sort_keys=True)
</ins><span class="cx">
</span><span class="cx"> cal = Calendar.parseText(caldata)
</span><span class="cx">
</span><del>- test2 = cal.getTextJSON()
</del><ins>+ test2 = cal.getTextJSON(sort_keys=True)
</ins><span class="cx"> self.assertEqual(
</span><span class="cx"> test1,
</span><span class="cx"> test2,
</span><span class="lines">@@ -424,6 +791,25 @@
</span><span class="cx"> _doRoundtrip(item1, item2)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def testParseJSONi18n(self):
+
+ def _doRoundtrip(caldata, jcaldata):
+ cal1 = Calendar.parseText(caldata)
+ test1 = cal1.getText()
+
+ cal2 = Calendar.parseJSONData(jcaldata)
+ test2 = cal2.getText()
+
+ self.assertEqual(
+ test1,
+ test2,
+ "\n".join(difflib.unified_diff(str(test1).splitlines(), test2.splitlines()))
+ )
+
+ for item1, item2 in self.i18ndata:
+ _doRoundtrip(item1, item2)
+
+
</ins><span class="cx"> def testjCalExample1(self):
</span><span class="cx">
</span><span class="cx"> jcaldata = """["vcalendar",
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendarplaintextvaluepy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/plaintextvalue.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/plaintextvalue.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/plaintextvalue.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def parseJSONValue(self, jobject):
</span><del>- self.mValue = str(jobject)
</del><ins>+ self.mValue = jobject.encode("utf-8")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def writeJSONValue(self, jobject):
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendarpropertypy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/property.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/property.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/property.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -472,21 +472,21 @@
</span><span class="cx"> prop = cls()
</span><span class="cx">
</span><span class="cx"> # Get the name
</span><del>- prop.mName = jobject[0].upper()
</del><ins>+ prop.mName = jobject[0].encode("utf-8").upper()
</ins><span class="cx">
</span><span class="cx"> # Get the parameters
</span><span class="cx"> if jobject[1]:
</span><span class="cx"> for name, value in jobject[1].items():
</span><span class="cx"> # Now add parameter value
</span><span class="cx"> name = name.upper()
</span><del>- attrvalue = Parameter(name=name, value=value)
</del><ins>+ attrvalue = Parameter(name=name.encode("utf-8"), value=value.encode("utf-8"))
</ins><span class="cx"> prop.mParameters.setdefault(name, []).append(attrvalue)
</span><span class="cx">
</span><span class="cx"> # Get default value type from property name and insert a VALUE parameter if current value type is not default
</span><span class="cx"> value_type = cls.sValueTypeMap.get(jobject[2].upper(), Value.VALUETYPE_UNKNOWN)
</span><span class="cx"> default_type = cls.sDefaultValueTypeMap.get(prop.mName.upper(), Value.VALUETYPE_UNKNOWN)
</span><span class="cx"> if default_type != value_type:
</span><del>- attrvalue = Parameter(name=cls.sValue, value=jobject[2].upper())
</del><ins>+ attrvalue = Parameter(name=cls.sValue, value=jobject[2].encode("utf-8").upper())
</ins><span class="cx"> prop.mParameters.setdefault(cls.sValue, []).append(attrvalue)
</span><span class="cx">
</span><span class="cx"> # Get value type from property name
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendartimezonedbpy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/timezonedb.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/timezonedb.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/timezonedb.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -127,7 +127,8 @@
</span><span class="cx"> tzpath = os.path.normpath(tzpath)
</span><span class="cx"> if tzpath.startswith(self.dbpath) and os.path.isfile(tzpath):
</span><span class="cx"> try:
</span><del>- self.calendar.parseComponent(open(tzpath))
</del><ins>+ with open(tzpath) as f:
+ self.calendar.parseComponent(f)
</ins><span class="cx"> except (IOError, InvalidData):
</span><span class="cx"> raise NoTimezoneInDatabase(self.dbpath, tzid)
</span><span class="cx"> else:
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendarvalidatorpy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/validator.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/validator.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/validator.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -27,7 +27,8 @@
</span><span class="cx"> Check whether the contents of the specified file is valid iCalendar or vCard data.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- data = open(fname).read()
</del><ins>+ with open(fname) as f:
+ data = f.read()
</ins><span class="cx">
</span><span class="cx"> ParserContext.allRaise()
</span><span class="cx">
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendarvcardadrpy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/vcard/adr.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/vcard/adr.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/vcard/adr.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def parseJSON(self, jobject):
</span><del>- self.mValue = tuple(jobject)
</del><ins>+ self.mValue = tuple(map(lambda x: x.encode("utf-8"), jobject))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def writeJSON(self, jobject):
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendarvcardnpy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/vcard/n.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/vcard/n.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/vcard/n.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def parseJSON(self, jobject):
</span><del>- self.mValue = tuple(jobject)
</del><ins>+ self.mValue = tuple(map(lambda x: x.encode("utf-8"), jobject))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def writeJSON(self, jobject):
</span></span></pre></div>
<a id="PyCalendartrunksrcpycalendarvcardorgvaluepy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/pycalendar/vcard/orgvalue.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/pycalendar/vcard/orgvalue.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/pycalendar/vcard/orgvalue.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def parseJSONValue(self, jobject):
</span><del>- self.mValue = tuple(jobject)
</del><ins>+ self.mValue = tuple(map(lambda x: x.encode("utf-8"), jobject))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def writeJSONValue(self, jobject):
</span></span></pre></div>
<a id="PyCalendartrunksrczonaltzconvertpy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/zonal/tzconvert.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/zonal/tzconvert.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/zonal/tzconvert.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -53,28 +53,28 @@
</span><span class="cx">
</span><span class="cx"> def parse(self, file):
</span><span class="cx"> try:
</span><del>- f = open(file, "r")
- ctr = 0
- for line in f:
- ctr += 1
- line = line[:-1]
- while True:
- if line.startswith("#") or len(line) == 0:
- break
- elif line.startswith("Rule"):
- self.parseRule(line)
- break
- elif line.startswith("Zone"):
- line = self.parseZone(line, f)
- if line is None:
</del><ins>+ with open(file, "r") as f:
+ ctr = 0
+ for line in f:
+ ctr += 1
+ line = line[:-1]
+ while True:
+ if line.startswith("#") or len(line) == 0:
</ins><span class="cx"> break
</span><del>- elif line.startswith("Link"):
- self.parseLink(line)
- break
- elif len(line.strip()) != 0:
- assert False, "Could not parse line %d from tzconvert file: '%s'" % (ctr, line,)
- else:
- break
</del><ins>+ elif line.startswith("Rule"):
+ self.parseRule(line)
+ break
+ elif line.startswith("Zone"):
+ line = self.parseZone(line, f)
+ if line is None:
+ break
+ elif line.startswith("Link"):
+ self.parseLink(line)
+ break
+ elif len(line.strip()) != 0:
+ assert False, "Could not parse line %d from tzconvert file: '%s'" % (ctr, line,)
+ else:
+ break
</ins><span class="cx"> except:
</span><span class="cx"> print("Failed to parse file %s" % (file,))
</span><span class="cx"> raise
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx"> def parseWindowsAliases(self, aliases):
</span><span class="cx">
</span><span class="cx"> try:
</span><del>- xmlfile = open(aliases)
- xmlroot = XML.ElementTree(file=xmlfile).getroot()
</del><ins>+ with open(aliases) as xmlfile:
+ xmlroot = XML.ElementTree(file=xmlfile).getroot()
</ins><span class="cx"> except (IOError, XMLParseError):
</span><span class="cx"> raise ValueError("Unable to open or read windows alias file: {}".format(aliases))
</span><span class="cx">
</span><span class="lines">@@ -217,7 +217,8 @@
</span><span class="cx">
</span><span class="cx"> # Generate link mapping file
</span><span class="cx"> linkPath = os.path.join(outputdir, "links.txt")
</span><del>- open(linkPath, "w").write("\n".join(link_list))
</del><ins>+ with open(linkPath, "w") as f:
+ f.write("\n".join(link_list))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="PyCalendartrunksrczonaltzdumppy"></a>
<div class="modfile"><h4>Modified: PyCalendar/trunk/src/zonal/tzdump.py (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/zonal/tzdump.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/zonal/tzdump.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -27,12 +27,12 @@
</span><span class="cx"> cal = Calendar()
</span><span class="cx"> if verbose:
</span><span class="cx"> print "Parsing calendar data: %s" % (file,)
</span><del>- fin = open(file, "r")
- try:
- cal.parse(fin)
- except InvalidData, e:
- print "Failed to parse bad data: %s" % (e.mData,)
- raise
</del><ins>+ with open(file, "r") as fin:
+ try:
+ cal.parse(fin)
+ except InvalidData, e:
+ print "Failed to parse bad data: %s" % (e.mData,)
+ raise
</ins><span class="cx"> return cal
</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 (14914 => 14915)</h4>
<pre class="diff"><span>
<span class="info">--- PyCalendar/trunk/src/zonal/tzverify.py 2015-06-25 18:47:00 UTC (rev 14914)
+++ PyCalendar/trunk/src/zonal/tzverify.py 2015-06-25 21:49:45 UTC (rev 14915)
</span><span class="lines">@@ -63,12 +63,12 @@
</span><span class="cx"> for file in files:
</span><span class="cx"> if verbose:
</span><span class="cx"> print "Parsing calendar data: %s" % (file,)
</span><del>- fin = open(file, "r")
- try:
- cal.parse(fin)
- except InvalidData, e:
- print "Failed to parse bad data: %s" % (e.mData,)
- raise
</del><ins>+ with open(file, "r") as fin:
+ try:
+ cal.parse(fin)
+ except InvalidData, e:
+ print "Failed to parse bad data: %s" % (e.mData,)
+ raise
</ins><span class="cx"> return CalendarZonesWrapper(calendar=cal)
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>