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

6227: libhtml handles strings differently in python2.x and python3.x

Browse Source 
svn: r20791
This commit is contained in:
Benny Malengier 2012-12-18 14:05:46 +00:00
parent 0e01b5919e
commit ef023ffdb3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps/plugins/lib/libhtml.py
View File

@ -36,6 +36,7 @@ from __future__ import print_function
import re
import locale
from gramps.gen.constfunc import STRTYPE
"""
HTML operations.
@ -331,7 +332,8 @@ class Html(list):
:rtype: object reference
:returns: reference to object with new value added
"""
if isinstance(value, Html) or not hasattr(value, '__iter__'):
if isinstance(value, Html) or (not hasattr(value, '__iter__') and
not isinstance(value, STRTYPE)):
value = [value]
index = len(self) - (1 if self.close else 0)
self[index:index] = value
@ -553,8 +555,9 @@ class Html(list):
:param name: new HTML contents
"""
if len(self) < 2:
raise AttributeError('No closing tag. Cannot set inside value')
if isinstance(value, Html) or not hasattr(value, '__iter__'):
raise AttributeError('No closing tag. Cannot set inside value')
if isinstance(value, Html) or (not hasattr(value, '__iter__') and
not isinstance(value, STRTYPE)):
value = [value]
self[1:-1] = value
#

2
gramps/plugins/webreport/narrativeweb.py
View File

@ -4102,7 +4102,7 @@ class SourcePages(BasePage):
for item in self.report.obj_dict[Source].items():
self.report.user.step_progress()
self.SourcePage(self.report, title, item)
self.SourcePage(self.report, title, item[0])
self.report.user.end_progress()