Restored Python 2.3 compatibility. Fixed typo of "certain".

philiptaylor · philiptaylor · commit abf1605bc920 · 2008-05-30T22:01:52.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%401160
diff --git a/src/html5lib/inputstream.py b/src/html5lib/inputstream.py
@@ -45,7 +45,7 @@ def __init__(self, source, encoding=None, parseMeta=True, chardet=True):
         # List of where new lines occur
         self.newLines = [0]
 
-        self.charEncoding = (encoding, "certian")
+        self.charEncoding = (encoding, "certain")
 
         # Raw Stream - for unicode objects this will encode to utf-8 and set
         #              self.charEncoding as appropriate
@@ -92,7 +92,7 @@ def openStream(self, source):
             # Otherwise treat source as a string and convert to a file object
             if isinstance(source, unicode):
                 source = source.encode('utf-8')
-                self.charEncoding = ("utf-8", "certian")
+                self.charEncoding = ("utf-8", "certain")
             import cStringIO
             stream = cStringIO.StringIO(str(source))
         return stream
@@ -316,7 +316,7 @@ def charsUntil(self, characters, opposite = False):
             chars = charsUntilRegEx[(characters, opposite)]
         except KeyError:
             for c in characters: assert(ord(c) < 128)
-            regex = u"".join("\\x%02x" % ord(c) for c in characters)
+            regex = u"".join(["\\x%02x" % ord(c) for c in characters])
             if not opposite:
                 regex = u"^%s" % regex
             chars = charsUntilRegEx[(characters, opposite)] = re.compile(u"[%s]*" % regex)
