33from gettext import gettext
44_ = gettext
55
6+ from six import text_type
7+
68from .import _base
79from ..constants import cdataElements ,rcdataElements ,voidElements
810
@@ -24,7 +26,7 @@ def __iter__(self):
2426name = token ["name" ]
2527if contentModelFlag != "PCDATA" :
2628raise LintError (_ ("StartTag not in PCDATA content model flag: %(tag)s" )% {"tag" :name })
27- if not isinstance (name ,str ):
29+ if not isinstance (name ,text_type ):
2830raise LintError (_ ("Tag name is not a string: %(tag)r" )% {"tag" :name })
2931if not name :
3032raise LintError (_ ("Empty tag name" ))
@@ -34,12 +36,14 @@ def __iter__(self):
3436raise LintError (_ ("Non-void element reported as EmptyTag token: %(tag)s" )% {"tag" :token ["name" ]})
3537if type == "StartTag" :
3638open_elements .append (name )
37- for name ,value in token ["data" ]:
38- if not isinstance (name ,str ):
39+ for (ns ,name ),value in token ["data" ].items ():
40+ if ns is not None and not isinstance (ns ,text_type ):
41+ raise LintError (_ ("Attribute namespace is not None or a string: %(name)r" )% {"name" :name })
42+ if not isinstance (name ,text_type ):
3943raise LintError (_ ("Attribute name is not a string: %(name)r" )% {"name" :name })
4044if not name :
4145raise LintError (_ ("Empty attribute name" ))
42- if not isinstance (value ,str ):
46+ if not isinstance (value ,text_type ):
4347raise LintError (_ ("Attribute value is not a string: %(value)r" )% {"value" :value })
4448if name in cdataElements :
4549contentModelFlag = "CDATA"
@@ -50,7 +54,7 @@ def __iter__(self):
5054
5155elif type == "EndTag" :
5256name = token ["name" ]
53- if not isinstance (name ,str ):
57+ if not isinstance (name ,text_type ):
5458raise LintError (_ ("Tag name is not a string: %(tag)r" )% {"tag" :name })
5559if not name :
5660raise LintError (_ ("Empty tag name" ))
@@ -67,7 +71,7 @@ def __iter__(self):
6771
6872elif type in ("Characters" ,"SpaceCharacters" ):
6973data = token ["data" ]
70- if not isinstance (data ,str ):
74+ if not isinstance (data ,text_type ):
7175raise LintError (_ ("Attribute name is not a string: %(name)r" )% {"name" :data })
7276if not data :
7377raise LintError (_ ("%(type)s token with empty data" )% {"type" :type })
@@ -80,7 +84,7 @@ def __iter__(self):
8084name = token ["name" ]
8185if contentModelFlag != "PCDATA" :
8286raise LintError (_ ("Doctype not in PCDATA content model flag: %(name)s" )% {"name" :name })
83- if not isinstance (name ,str ):
87+ if not isinstance (name ,text_type ):
8488raise LintError (_ ("Tag name is not a string: %(tag)r" )% {"tag" :name })
8589# XXX: what to do with token["data"] ?
8690