Change to built in set type where avaliable

jgraham · jgraham · commit 679f808dd035 · 2006-12-25T00:27:34.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40333
diff --git a/src/constants.py b/src/constants.py
@@ -1,9 +1,11 @@
 import string
 
 try:
+    type(frozenset)
+except NameError:
+    #Import from the sets module for python 2.3
+    from sets import Set as set
     from sets import ImmutableSet as frozenset
-except:
-    pass
 
 EOF = None
 
@@ -127,14 +129,15 @@
 digits = frozenset(string.digits)
 hexDigits = frozenset(string.hexdigits)
 
-headingElements = frozenset((
+#Heading elements need to be ordered 
+headingElements = (
     "h1",
     "h2",
     "h3",
     "h4",
     "h5",
     "h6"
-))
+)
 
 # XXX What about event-source and command?
 voidElements = frozenset((
diff --git a/src/tokenizer.py b/src/tokenizer.py
@@ -1,7 +1,9 @@
 try:
+    type(frozenset)
+except NameError:
+    #Import from the sets module for python 2.3
+    from sets import Set as set
     from sets import ImmutableSet as frozenset
-except:
-    pass
 
 from constants import contentModelFlags, spaceCharacters
 from constants import entitiesWindows1252, entities, voidElements
diff --git a/src/utils.py b/src/utils.py
@@ -1,7 +1,9 @@
 try:
+    type(frozenset)
+except NameError:
+    #Import from the sets module for python 2.3
+    from sets import Set as set
     from sets import ImmutableSet as frozenset
-except:
-    pass
 
 class MethodDispatcher(dict):
     """Dict with 2 special properties:
