1
- try :
2
- frozenset
3
- except NameError :
4
- # Import from the sets module for python 2.3
5
- from sets import Set as set
6
- from sets import ImmutableSet as frozenset
7
1
import sys
8
2
9
- import inputstream
10
- import tokenizer
3
+ from . import inputstream
4
+ from . import tokenizer
11
5
12
- import treebuilders
13
- from treebuilders ._base import Marker
14
- from treebuilders import simpletree
6
+ from . import treebuilders
7
+ from . treebuilders ._base import Marker
8
+ from . treebuilders import simpletree
15
9
16
- import utils
17
- from constants import contentModelFlags , spaceCharacters , asciiUpper2Lower
18
- from constants import scopingElements , formattingElements , specialElements
19
- from constants import headingElements , tableInsertModeElements
20
- from constants import cdataElements , rcdataElements , voidElements
21
- from constants import tokenTypes
10
+ from . import utils
11
+
12
+ from .constants import contentModelFlags , spaceCharacters , asciiUpper2Lower
13
+ from .constants import scopingElements , formattingElements , specialElements
14
+ from .constants import headingElements , tableInsertModeElements
15
+ from .constants import cdataElements , rcdataElements , voidElements
16
+ from .constants import tokenTypes
22
17
23
18
def parse (doc , treebuilderName = "simpletree" , encoding = None ):
24
19
tb = treebuilders .getTreeBuilder (treebuilderName )
@@ -307,7 +302,7 @@ def startTagHtml(self, token):
307
302
self .parser .parseError ("non-html-root" )
308
303
# XXX Need a check here to see if the first start tag token emitted is
309
304
# this token... If it's not, invoke self.parser.parseError().
310
- for attr , value in token ["data" ].iteritems ():
305
+ for attr , value in token ["data" ].items ():
311
306
if attr not in self .tree .openElements [0 ].attributes :
312
307
self .tree .openElements [0 ].attributes [attr ] = value
313
308
self .parser .firstStartTag = False
@@ -821,7 +816,7 @@ def startTagBody(self, token):
821
816
or self .tree .openElements [1 ].name != "body" ):
822
817
assert self .parser .innerHTML
823
818
else :
824
- for attr , value in token ["data" ].iteritems ():
819
+ for attr , value in token ["data" ].items ():
825
820
if attr not in self .tree .openElements [1 ].attributes :
826
821
self .tree .openElements [1 ].attributes [attr ] = value
827
822
@@ -834,7 +829,7 @@ def startTagCloseP(self, token):
834
829
835
830
def startTagForm (self , token ):
836
831
if self .tree .formPointer :
837
- self .parser .parseError (u "unexpected-start-tag" , {"name" : "form" })
832
+ self .parser .parseError ("unexpected-start-tag" , {"name" : "form" })
838
833
else :
839
834
if self .tree .elementInScope ("p" ):
840
835
self .endTagP ("p" )
@@ -855,7 +850,7 @@ def startTagListItem(self, token):
855
850
if i >= 1 :
856
851
self .parser .parseError (
857
852
i == 1 and "missing-end-tag" or "missing-end-tags" ,
858
- {"name" : u ", " .join ([item .name
853
+ {"name" : ", " .join ([item .name
859
854
for item
860
855
in poppedNodes [:- 1 ]])})
861
856
break
0 commit comments