(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

@@ -157,7 +157,11 @@ class Combiner(Builder):
def __init__(self, parts):
self._parts = parts
self._offsets = []
text_parts = [(p if isinstance(p, basestring) else p.get_text()) for p in self._parts]
text_parts = [
(p if isinstance(p, six.text_type) else
p.decode('utf8') if isinstance(p, six.binary_type) else
p.get_text())
for p in self._parts]
self._text = ''.join(text_parts)
offset = 0