Commit f6093063 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Removed compatibility with Sphinx < 1.0 workarounds in our extension code.... 

Removed compatibility with Sphinx < 1.0 workarounds in our extension code. Also, started to use the 'needs_sphinx' Sphinx config var.

Follow up on r14624.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent c0adc62f

docs/_ext/djangodocs.py

+2 −8
Original line number Diff line number Diff line
@@ -83,10 +83,7 @@ class VersionDirective(Directive): 
        if not is_nextversion:

            if len(self.arguments) == 1:

                linktext = 'Please, see the release notes </releases/%s>' % (arg0)

                try:

                    xrefs = roles.XRefRole()('doc', linktext, linktext, self.lineno, self.state) # Sphinx >= 1.0

                except AttributeError:

                    xrefs = roles.xfileref_role('doc', linktext, linktext, self.lineno, self.state) # Sphinx < 1.0

                xrefs = roles.XRefRole()('doc', linktext, linktext, self.lineno, self.state)

                node.extend(xrefs[0])

            node['version'] = arg0

        else:
@@ -196,10 +193,7 @@ def parse_django_admin_node(env, sig, signode): 


def parse_django_adminopt_node(env, sig, signode):

    """A copy of sphinx.directives.CmdoptionDesc.parse_signature()"""

    try:

        from sphinx.domains.std import option_desc_re # Sphinx >= 1.0

    except ImportError:

        from sphinx.directives.desc import option_desc_re # Sphinx < 1.0

    from sphinx.domains.std import option_desc_re

    count = 0

    firstname = ''

    for m in option_desc_re.finditer(sig):

docs/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext")) 
# -- General configuration -----------------------------------------------------



# If your documentation needs a minimal Sphinx version, state it here.

#needs_sphinx = '1.0'

needs_sphinx = '1.0'



# Add any Sphinx extension module names here, as strings. They can be extensions

# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.