Remove a lot of old 2.3/2.4 support code

gsnedders · gsnedders · commit 84b1710cb9e4 · 2013-02-01T15:00:33.000Z
diff --git a/html5lib/constants.py b/html5lib/constants.py
@@ -1,13 +1,6 @@
 import string, gettext
 _ = gettext.gettext
 
-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
-
 EOF = None
 
 E = {
diff --git a/html5lib/filters/whitespace.py b/html5lib/filters/whitespace.py
@@ -1,9 +1,3 @@
-try:
-    frozenset
-except NameError:
-    # Import from the sets module for python 2.3
-    from sets import ImmutableSet as frozenset
-
 import re
 
 from . import _base
diff --git a/html5lib/html5parser.py b/html5lib/html5parser.py
@@ -1,32 +1,3 @@
-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
-
-try:
-    any
-except:
-    # Implement 'any' for python 2.4 and previous
-    def any(iterable):
-        for element in iterable:
-            if element:
-                return True
-        return False
-        
-try:
-    "abc".startswith(("a", "b"))
-    def startswithany(str, prefixes):
-        return str.startswith(prefixes)
-except:
-    # Python 2.4 doesn't accept a tuple as argument to string startswith
-    def startswithany(str, prefixes):
-        for prefix in prefixes:
-            if str.startswith(prefix):
-                return True
-        return False
-
 import sys
 import types
 
@@ -540,7 +511,7 @@ def processDoctype(self, token):
                 publicId = publicId.translate(asciiUpper2Lower)
 
             if (not correct or token["name"] != "html"
-                or startswithany(publicId,
+                or publicId.startswith(
                 ("+//silmaril//dtd html pro v0r11 19970101//",
                  "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
                  "-//as//dtd html 3.0 aswedit + extensions//",
@@ -600,16 +571,16 @@ def processDoctype(self, token):
                     ("-//w3o//dtd w3 html strict 3.0//en//",
                      "-/w3c/dtd html 4.0 transitional/en",
                      "html")
-                or startswithany(publicId,
+                or publicId.startswith(
                     ("-//w3c//dtd html 4.01 frameset//",
                      "-//w3c//dtd html 4.01 transitional//")) and 
                     systemId == None
                 or systemId and systemId.lower() == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"):
                 self.parser.compatMode = "quirks"
-            elif (startswithany(publicId,
+            elif (publicId.startswith(
                     ("-//w3c//dtd xhtml 1.0 frameset//",
                      "-//w3c//dtd xhtml 1.0 transitional//"))
-                  or startswithany(publicId,
+                  or publicId.startswith(
                       ("-//w3c//dtd html 4.01 frameset//",
                        "-//w3c//dtd html 4.01 transitional//")) and 
                       systemId != None):
diff --git a/html5lib/serializer/htmlserializer.py b/html5lib/serializer/htmlserializer.py
@@ -1,18 +1,12 @@
-try:
-    frozenset
-except NameError:
-    # Import from the sets module for python 2.3
-    from sets import ImmutableSet as frozenset
+import gettext
+_ = gettext.gettext
 
 try:
     from functools import reduce
     pass # no-op statement to avoid 3to2 introducing parse error
 except ImportError:
     pass
 
-import gettext
-_ = gettext.gettext
-
 from html5lib.constants import voidElements, booleanAttributes, spaceCharacters
 from html5lib.constants import rcdataElements, entities, xmlEntities
 from html5lib import utils
diff --git a/html5lib/tokenizer.py b/html5lib/tokenizer.py
@@ -1,13 +1,4 @@
-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
-try:
-    from collections import deque
-except ImportError:
-    from .utils import deque
+from collections import deque
     
 from .constants import spaceCharacters
 from .constants import entitiesWindows1252, entities
diff --git a/html5lib/treebuilders/_base.py b/html5lib/treebuilders/_base.py
@@ -1,10 +1,4 @@
 from html5lib.constants import scopingElements, tableInsertModeElements, namespaces
-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
 
 # The scope markers are inserted when entering object elements,
 # marquees, table cells, and table captions, and are used to prevent formatting
diff --git a/html5lib/utils.py b/html5lib/utils.py
@@ -1,10 +1,3 @@
-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
-
 from types import ModuleType
 
 
@@ -38,125 +31,6 @@ def __init__(self, items=()):
     def __getitem__(self, key):
         return dict.get(self, key, self.default)
 
-#Pure python implementation of deque taken from the ASPN Python Cookbook
-#Original code by Raymond Hettinger
-
-class deque(object):
-
-    def __init__(self, iterable=(), maxsize=-1):
-        if not hasattr(self, 'data'):
-            self.left = self.right = 0
-            self.data = {}
-        self.maxsize = maxsize
-        self.extend(iterable)
-
-    def append(self, x):
-        self.data[self.right] = x
-        self.right += 1
-        if self.maxsize != -1 and len(self) > self.maxsize:
-            self.popleft()
-        
-    def appendleft(self, x):
-        self.left -= 1        
-        self.data[self.left] = x
-        if self.maxsize != -1 and len(self) > self.maxsize:
-            self.pop()      
-        
-    def pop(self):
-        if self.left == self.right:
-            raise IndexError('cannot pop from empty deque')
-        self.right -= 1
-        elem = self.data[self.right]
-        del self.data[self.right]         
-        return elem
-    
-    def popleft(self):
-        if self.left == self.right:
-            raise IndexError('cannot pop from empty deque')
-        elem = self.data[self.left]
-        del self.data[self.left]
-        self.left += 1
-        return elem
-
-    def clear(self):
-        self.data.clear()
-        self.left = self.right = 0
-
-    def extend(self, iterable):
-        for elem in iterable:
-            self.append(elem)
-
-    def extendleft(self, iterable):
-        for elem in iterable:
-            self.appendleft(elem)
-
-    def rotate(self, n=1):
-        if self:
-            n %= len(self)
-            for i in range(n):
-                self.appendleft(self.pop())
-
-    def __getitem__(self, i):
-        if i < 0:
-            i += len(self)
-        try:
-            return self.data[i + self.left]
-        except KeyError:
-            raise IndexError
-
-    def __setitem__(self, i, value):
-        if i < 0:
-            i += len(self)        
-        try:
-            self.data[i + self.left] = value
-        except KeyError:
-            raise IndexError
-
-    def __delitem__(self, i):
-        size = len(self)
-        if not (-size <= i < size):
-            raise IndexError
-        data = self.data
-        if i < 0:
-            i += size
-        for j in range(self.left+i, self.right-1):
-            data[j] = data[j+1]
-        self.pop()
-    
-    def __len__(self):
-        return self.right - self.left
-
-    def __cmp__(self, other):
-        if type(self) != type(other):
-            return cmp(type(self), type(other))
-        return cmp(list(self), list(other))
-            
-    def __repr__(self, _track=[]):
-        if id(self) in _track:
-            return '...'
-        _track.append(id(self))
-        r = 'deque(%r)' % (list(self),)
-        _track.remove(id(self))
-        return r
-    
-    def __getstate__(self):
-        return (tuple(self),)
-    
-    def __setstate__(self, s):
-        self.__init__(s[0])
-        
-    def __hash__(self):
-        raise TypeError
-    
-    def __copy__(self):
-        return self.__class__(self)
-    
-    def __deepcopy__(self, memo={}):
-        from copy import deepcopy
-        result = self.__class__()
-        memo[id(self)] = result
-        result.__init__(deepcopy(tuple(self), memo))
-        return result
 
 #Some utility functions to dal with weirdness around UCS2 vs UCS4
 #python builds
