(core) Remaining Python 3 compatibility changes

Summary: Biggest change is turning everything to unicode

Test Plan: The tests

Reviewers: dsagal, paulfitz

Reviewed By: dsagal

Differential Revision: https://phab.getgrist.com/D2875
This commit is contained in:
Alex Hall
2021-06-24 14:23:33 +02:00
parent 1af99e9567
commit 305b133c59
30 changed files with 276 additions and 177 deletions

View File

@@ -142,8 +142,9 @@ class TzInfo(_tzinfo):
def tzname(self, dt):
"""Implementation of tzinfo.tzname interface."""
abbr = self.zone.dt_tzname(dt, self._favor_offset)
# tzname must return a string, not unicode.
return abbr.encode('utf8') if isinstance(abbr, unicode) else abbr
if six.PY2 and isinstance(abbr, six.text_type):
abbr = abbr.encode('utf8')
return abbr
def dst(self, dt):
"""Implementation of tzinfo.dst interface."""