diff -Nru python-tz-2014.10~dfsg1/debian/changelog python-tz-2014.10~dfsg1/debian/changelog --- python-tz-2014.10~dfsg1/debian/changelog 2015-02-16 05:15:31.000000000 -0600 +++ python-tz-2014.10~dfsg1/debian/changelog 2015-10-01 19:51:48.000000000 -0500 @@ -1,3 +1,11 @@ +python-tz (2014.10~dfsg1-0ubuntu2~15.04.0) vivid; urgency=medium + + * debian/patches/use_utf8_encoding.patch: + - use utf8 encoding to be compatible with new tzdata versions + (lp: #1473533) + + -- Robert C Jennings Thu, 01 Oct 2015 19:51:05 -0500 + python-tz (2014.10~dfsg1-0ubuntu1) vivid; urgency=medium * New upstream release. diff -Nru python-tz-2014.10~dfsg1/debian/patches/series python-tz-2014.10~dfsg1/debian/patches/series --- python-tz-2014.10~dfsg1/debian/patches/series 2015-02-16 05:08:32.000000000 -0600 +++ python-tz-2014.10~dfsg1/debian/patches/series 2015-10-01 10:42:31.000000000 -0500 @@ -1 +1,2 @@ tzdata +use_utf8_encoding.patch diff -Nru python-tz-2014.10~dfsg1/debian/patches/use_utf8_encoding.patch python-tz-2014.10~dfsg1/debian/patches/use_utf8_encoding.patch --- python-tz-2014.10~dfsg1/debian/patches/use_utf8_encoding.patch 1969-12-31 18:00:00.000000000 -0600 +++ python-tz-2014.10~dfsg1/debian/patches/use_utf8_encoding.patch 2015-10-01 21:52:39.000000000 -0500 @@ -0,0 +1,27 @@ +Description: use utf8 encoding to be compatible with new tzdata versions +Origin: upstream, http://bazaar.launchpad.net/~stub/pytz/devel/revision/367 +Bug: https://bugs.launchpad.net/pytz/+bug/1473533 + +=== modified file 'src/pytz/__init__.py' +Index: python-tz-2014.10~dfsg1/pytz/__init__.py +=================================================================== +--- python-tz-2014.10~dfsg1.orig/pytz/__init__.py ++++ python-tz-2014.10~dfsg1/pytz/__init__.py +@@ -319,7 +319,7 @@ class _CountryTimezoneDict(LazyDict): + zone_tab = open_resource('zone.tab') + try: + for line in zone_tab: +- line = line.decode('US-ASCII') ++ line = line.decode('UTF-8') + if line.startswith('#'): + continue + code, coordinates, zone = line.split(None, 4)[:3] +@@ -347,7 +347,7 @@ class _CountryNameDict(LazyDict): + zone_tab = open_resource('iso3166.tab') + try: + for line in zone_tab.readlines(): +- line = line.decode('US-ASCII') ++ line = line.decode('UTF-8') + if line.startswith('#'): + continue + code, name = line.split(None, 1)