[CalendarServer-changes] [13576] PyCalendar/trunk/src/zonal

[source_changes at macosforge.org]

Revision: 13576
          http://trac.calendarserver.org//changeset/13576
Author:   cdaboo at apple.com
Date:     2014-05-30 11:39:42 -0700 (Fri, 30 May 2014)
Log Message:
-----------
Fix IANA db parsing issue.

Modified Paths:
--------------
    PyCalendar/trunk/src/zonal/tests/test_zone.py
    PyCalendar/trunk/src/zonal/tzconvert.py

Modified: PyCalendar/trunk/src/zonal/tests/test_zone.py
===================================================================
--- PyCalendar/trunk/src/zonal/tests/test_zone.py	2014-05-30 17:23:49 UTC (rev 13575)
+++ PyCalendar/trunk/src/zonal/tests/test_zone.py	2014-05-30 18:39:42 UTC (rev 13576)
@@ -27,11 +27,17 @@
 \t\t\t-5:00\tNYC\tE%sT\t1942
 \t\t\t-5:00\tUS\tE%sT\t1946
 \t\t\t-5:00\tNYC\tE%sT\t1967
+  \t\t-5:00\tUS\tE%sT"""
+        zonedef_result = """Zone America/New_York\t-4:56:02\t-\tLMT\t1883 Nov 18 12:03:58
+\t\t\t-5:00\tUS\tE%sT\t1920
+\t\t\t-5:00\tNYC\tE%sT\t1942
+\t\t\t-5:00\tUS\tE%sT\t1946
+\t\t\t-5:00\tNYC\tE%sT\t1967
 \t\t\t-5:00\tUS\tE%sT"""
         zone = Zone()
         zone.parse(zonedef)
 
-        self.assertEqual(str(zone), zonedef)
+        self.assertEqual(str(zone), zonedef_result)
 
 
     def test_vtimezone(self):

Modified: PyCalendar/trunk/src/zonal/tzconvert.py
===================================================================
--- PyCalendar/trunk/src/zonal/tzconvert.py	2014-05-30 17:23:49 UTC (rev 13575)
+++ PyCalendar/trunk/src/zonal/tzconvert.py	2014-05-30 18:39:42 UTC (rev 13576)
@@ -88,7 +88,7 @@
         last_line = None
         for nextline in f:
             nextline = nextline[:-1]
-            if nextline.startswith("\t"):
+            if nextline.startswith("\t"): # or nextline.startswith(" "):
                 os.write("\n")
                 os.write(nextline)
             elif nextline.startswith("#") or len(nextline) == 0:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140530/95b0e646/attachment-0001.html>