Commita32418c

committed

lxml gives text/tail as bytes under Py2, so accomodate for this.

1 parent356f8a1 commita32418cCopy full SHA for a32418c

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`importwarnings`
`13`	`13`	`importre`
	`14`	`+importsys`
`14`	`15`
`15`	`16`	`from .import_base`
`16`	`17`	`fromhtml5lib.constantsimportDataLossWarning`
`@@ -71,8 +72,9 @@ def serializeElement(element, indent=0):`
`71`	`72`	`whilenext_elementisnotNone:`
`72`	`73`	`serializeElement(next_element,indent+2)`
`73`	`74`	`next_element=next_element.getnext()`
`74`		`-elifisinstance(element,str):`
	`75`	`+elifisinstance(element,str)orisinstance(element,bytes):`
`75`	`76`	`#Text in a fragment`
	`77`	`+assertisinstance(element,str)orsys.version_info.major==2`
`76`	`78`	`rv.append("\|%s\"%s\""%(' '*indent,element))`
`77`	`79`	`else:`
`78`	`80`	`#Fragment case`
`@@ -84,6 +86,7 @@ def serializeElement(element, indent=0):`
`84`	`86`	`ifhasattr(element,"tail")andelement.tail:`
`85`	`87`	`rv.append("\|%s\"%s\""%(' '*indent,element.tail))`
`86`	`88`	`else:`
	`89`	`+assertisinstance(element,etree._Element)`
`87`	`90`	`nsmatch=etree_builders.tag_regexp.match(element.tag)`
`88`	`91`	`ifnsmatchisnotNone:`
`89`	`92`	`ns=nsmatch.group(1)`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`fromhtml5lib.treebuilders.etreeimporttag_regexp`
`3`	`3`
`4`	`4`	`fromgettextimportgettext`
	`5`	`+importsys`
`5`	`6`	`_=gettext`
`6`	`7`
`7`	`8`	`from .import_base`
`@@ -71,7 +72,8 @@ def __init__(self, fragment_root, obj):`
`71`	`72`	`self.tail=self.obj.tail`
`72`	`73`	`else:`
`73`	`74`	`self.tail=None`
`74`		`-self.isstring=isinstance(obj,str)`
	`75`	`+self.isstring=isinstance(obj,str)orisinstance(obj,bytes)`
	`76`	`+assertnotself.isstringorisinstance(obj,str)orsys.version_info.major==2`
`75`	`77`
`76`	`78`	`def__getattr__(self,name):`
`77`	`79`	`returngetattr(self.obj,name)`

Comments

(0)