diff options
author | Vratislav Podzimek <vpodzime@redhat.com> | 2012-12-18 11:27:00 +0100 |
---|---|---|
committer | Brian C. Lane <bcl@redhat.com> | 2012-12-18 16:43:13 -0800 |
commit | b873bb11f083cf65b741bf906892899408adb601 (patch) | |
tree | 30b621a4cf2a72b6e8ff10b645a633ef2008011e /pyanaconda/timezone.py | |
parent | 4bf283202b979448dc39866859658ea99de60092 (diff) | |
download | anaconda-b873bb11f083cf65b741bf906892899408adb601.tar.gz anaconda-b873bb11f083cf65b741bf906892899408adb601.tar.xz anaconda-b873bb11f083cf65b741bf906892899408adb601.zip |
Encode unicode strings returned by pytz.country_timezones() (#887236)
pytz.country_timezones() now returns unicodes strings instead of
byte strings. Concatenating byte string and unicode string causes
traceback, so we need to encode these unicode strings as utf-8
before returning them from our function.
Signed-off-by: Vratislav Podzimek <vpodzime@redhat.com>
Diffstat (limited to 'pyanaconda/timezone.py')
-rw-r--r-- | pyanaconda/timezone.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pyanaconda/timezone.py b/pyanaconda/timezone.py index f08f0c42f..5337a217a 100644 --- a/pyanaconda/timezone.py +++ b/pyanaconda/timezone.py @@ -134,6 +134,7 @@ def get_all_territory_timezones(territory): except KeyError: timezones = list() + timezones = [zone.encode("utf-8") for zone in timezones] return timezones |