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

Fix StyledText so serialize will match for style list order changes

Browse Source 
Fixes #11529
This commit is contained in:
prculley 2020-01-12 10:16:39 -06:00 committed by Paul Culley
parent d83fff3b62
commit 26b78c17af
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gramps/gen/lib/styledtext.py
View File

@ -299,6 +299,7 @@ class StyledText:
""" """
if self._tags: if self._tags:
the_tags = [tag.serialize() for tag in self._tags] the_tags = [tag.serialize() for tag in self._tags]
the_tags.sort()
else: else:
the_tags = [] the_tags = []

6
gramps/gen/lib/test/styledtext_test.py
View File

@ -64,11 +64,11 @@ class Test1(unittest.TestCase):
C = self.C.join([self.A, self.S, deepcopy(self.B)]) C = self.C.join([self.A, self.S, deepcopy(self.B)])
C = C.replace('X', StyledText('_', [self.T3])) C = C.replace('X', StyledText('_', [self.T3]))
_C = ('123_456\ncleartext\nabc_def', _C = ('123_456\ncleartext\nabc_def',
[((1, ''), 'v1', [(0, 2), (2, 3)]), [((0, ''), 'v3', [(3, 4)]),
((0, ''), 'v3', [(3, 4)]), ((0, ''), 'v3', [(21, 22)]),
((1, ''), 'v1', [(0, 2), (2, 3)]),
((1, ''), 'v1', [(4, 6)]), ((1, ''), 'v1', [(4, 6)]),
((2, ''), 'v2', [(19, 21), (18, 21)]), ((2, ''), 'v2', [(19, 21), (18, 21)]),
((0, ''), 'v3', [(21, 22)]),
((2, ''), 'v2', [(22, 23), (22, 25)])]) ((2, ''), 'v2', [(22, 23), (22, 25)])])
self.assertEqual(C.serialize(), _C) self.assertEqual(C.serialize(), _C)