Merge pull request #10 from zopefoundation/remove-canada-saskatchewan…

…-issue-9

Removed Canada/East-Saskatchewan from timezone data.

CHANGES.txt

@@ -4,7 +4,9 @@ Changelog
 2.12.9 (unreleased)
 -------------------
 
-- TBD
+- Removed Canada/East-Saskatchewan from timezone data.
+  It was removed upstream.
+  Fixes `issue 9 <https://github.com/zopefoundation/DateTime/issues/9>`_.
 
 2.12.8 (2015-06-15)
 -------------------
@@ -30,13 +32,13 @@ Changelog
 2.12.5 (2010-07-29)
 -------------------
 
-- Launchpad #143269: Corrected the documentation for year value 
-  behavior when constructing a DateTime object with three numeric 
+- Launchpad #143269: Corrected the documentation for year value
+  behavior when constructing a DateTime object with three numeric
   arguments.
 
-- Launchpad #142521: Removed confusing special case in 
-  DateTime.__str__ where DateTime instances for midnight 
-  (e.g. '2010-07-27 00:00:00 US/Eastern') values would 
+- Launchpad #142521: Removed confusing special case in
+  DateTime.__str__ where DateTime instances for midnight
+  (e.g. '2010-07-27 00:00:00 US/Eastern') values would
   render only their date and nothing else.
 
 2.12.4 (2010-07-12)
@@ -53,7 +55,7 @@ Changelog
 2.12.2 (2010-05-05)
 -------------------
 
-- Launchpad #572715:  Relaxed pin on pytz, after applying a patch from 
+- Launchpad #572715:  Relaxed pin on pytz, after applying a patch from
   Marius Gedminus which fixes the apparent API breakage.
 
 2.12.1 (2010-04-30)
@@ -94,4 +96,3 @@ Changelog
 ---------------------
 
 - Split off from the Zope2 main source code tree.
-

src/DateTime/tests/legacy.py

@@ -56,7 +56,7 @@ def info(self,t=None):
 
 _zlst =   ['Brazil/Acre','Brazil/DeNoronha','Brazil/East',
            'Brazil/West','Canada/Atlantic','Canada/Central',
-           'Canada/Eastern','Canada/East-Saskatchewan',
+           'Canada/Eastern',
            'Canada/Mountain','Canada/Newfoundland',
            'Canada/Pacific','Canada/Yukon',
            'Chile/Continental','Chile/EasterIsland','CST','Cuba',
@@ -103,7 +103,6 @@ def info(self,t=None):
            'canada/atlantic':'Canada/Atlantic',
            'canada/central':'Canada/Central',
            'canada/eastern':'Canada/Eastern',
-           'canada/east-saskatchewan':'Canada/East-Saskatchewan',
            'canada/mountain':'Canada/Mountain',
            'canada/newfoundland':'Canada/Newfoundland',
            'canada/pacific':'Canada/Pacific','canada/yukon':'Canada/Yukon',
@@ -195,4 +194,4 @@ def info(self,t=None):
            'ret':'GMT+4', 'ist': 'GMT+0530'
            }
 
-timezones = dict((name, _timezone(data)) for name, data in _data.iteritems())
+timezones = dict((name, _timezone(data)) for name, data in _data.iteritems())