Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FamilyGroup Report crash

Browse Source 
Python's sort routine gratuitously converts the bytearrays returned by
ICU::Collator::getByteArray to a string when storing it. This resulted
in a TypeError when attempting to compare a just-returned bytearray
with a stored string.

We work around this by converting the bytearray into its hexadecimal
representation and then decoding that into a string.

Fixes #10077.
This commit is contained in:
John Ralls 2017-06-27 11:30:00 -07:00
parent a63e0c2e23
commit 19adb31b0e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/gen/utils/grampslocale.py
View File

@ -33,6 +33,7 @@ import codecs
import locale import locale
import collections import collections
import logging import logging
from binascii import hexlify
LOG = logging.getLogger("." + __name__) LOG = logging.getLogger("." + __name__)
LOG.propagate = True LOG.propagate = True
@ -920,8 +921,9 @@ class GrampsLocale:
""" """
if HAVE_ICU and self.collator: if HAVE_ICU and self.collator:
#ICU can digest strings and unicode # ICU can digest strings and unicode
return self.collator.getCollationKey(string).getByteArray() # Use hexlify() as to make a consistent string, fixing bug #10077
return hexlify(self.collator.getCollationKey(string).getByteArray()).decode()
else: else:
if isinstance(string, bytes): if isinstance(string, bytes):
string = string.decode("utf-8", "replace") string = string.decode("utf-8", "replace")