Now sphinx.ext.autodoc work with python-2.5 again, again.

sphinx/application.py

@@ -17,7 +17,6 @@ import types
 import posixpath
 from os import path
 from cStringIO import StringIO
-from collections import deque
 
 from docutils import nodes
 from docutils.parsers.rst import convert_directive_function, \
@@ -34,6 +33,7 @@ from sphinx.domains.std import GenericObject, Target, StandardDomain
 from sphinx.builders import BUILTIN_BUILDERS
 from sphinx.environment import BuildEnvironment, SphinxStandaloneReader
 from sphinx.util import pycompat  # imported for side-effects
+from sphinx.util.pycompat import deque
 from sphinx.util.tags import Tags
 from sphinx.util.osutil import ENOENT
 from sphinx.util.console import bold, lightgray, darkgray

sphinx/util/pycompat.py

@@ -75,7 +75,6 @@ else:
     import locale
     sys_encoding = locale.getpreferredencoding()
     # use Python 3 name
-    from itertools import izip_longest as zip_longest
     import __builtin__ as builtins
 
 
@@ -198,6 +197,9 @@ else:
             f.write = MethodType(write, f)
         return f
 
+    from collections import deque as _deque
+    def deque(maxlen):
+        return _deque()
 
 # ------------------------------------------------------------------------------
 # Missing builtins and codecs in Python < 2.5

sphinx/writers/text.py

@@ -11,13 +11,14 @@
 import os
 import re
 import textwrap
-from itertools import groupby, izip_longest
+from itertools import groupby
 
 from docutils import nodes, writers
 from docutils.utils import column_width
 
 from sphinx import addnodes
 from sphinx.locale import admonitionlabels, _
+from sphinx.util.pycompat import zip_longest
 
 
 class TextWrapper(textwrap.TextWrapper):
@@ -503,7 +504,7 @@ class TextTranslator(nodes.NodeVisitor):
             self.add_text(''.join(out) + self.nl)
 
         def writerow(row):
-            lines = izip_longest(*row)
+            lines = zip_longest(*row)
             for line in lines:
                 out = ['|']
                 for i, cell in enumerate(line):