Changed an assertTrue in the tokenizer unittest to assertEquals because assertTrue isn't available in the default unittest framework for python2.3. Also added the frozenset, set imports for parser.py since it uses frozenset. python2.3 now passes all the tests.

lantis63 · lantis63 · commit ab201934bcfc · 2006-12-25T00:39:45.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40334
diff --git a/src/constants.py b/src/constants.py
@@ -1,7 +1,7 @@
 import string
 
 try:
-    type(frozenset)
+    frozenset
 except NameError:
     #Import from the sets module for python 2.3
     from sets import Set as set
diff --git a/src/parser.py b/src/parser.py
@@ -1,3 +1,10 @@
+try:
+    frozenset
+except NameError:
+    #Import from the sets module for python 2.3
+    from sets import Set as set
+    from sets import ImmutableSet as frozenset
+
 import tokenizer
 
 import utils
diff --git a/src/tokenizer.py b/src/tokenizer.py
@@ -1,5 +1,5 @@
 try:
-    type(frozenset)
+    frozenset
 except NameError:
     #Import from the sets module for python 2.3
     from sets import Set as set
diff --git a/src/utils.py b/src/utils.py
@@ -1,5 +1,5 @@
 try:
-    type(frozenset)
+    frozenset
 except NameError:
     #Import from the sets module for python 2.3
     from sets import Set as set
diff --git a/tests/test_tokenizer.py b/tests/test_tokenizer.py
@@ -87,7 +87,7 @@ def runTokenizerTest(self, input, output):
         tokens = concatenateCharacterTokens(tokens)
         errorMsg = "\n".join(["\n\nExpected:", str(output), "\nRecieved:",
                              str(tokens)])
-        self.assertTrue(tokensMatch(tokens, output), errorMsg)
+        self.assertEquals(tokensMatch(tokens, output), True, errorMsg)
 
 
 def test_tokenizer():
