Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Removed compatibility with Sphinx < 1.0 workarounds in our ex…

…tension code. Also, started to use the 'needs_sphinx' Sphinx config var.

Follow up on r14624.

Backport of [14631] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8d3e66fad61c96aa2269a2a3ca38fb3f5cab1189 1 parent 04fec1b
@ramiro ramiro authored
Showing with 3 additions and 9 deletions.
  1. +2 −8 docs/_ext/djangodocs.py
  2. +1 −1  docs/conf.py
View
10 docs/_ext/djangodocs.py
@@ -83,10 +83,7 @@ def run(self):
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):
View
2  docs/conf.py
@@ -22,7 +22,7 @@
# -- 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.
Please sign in to comment.
Something went wrong with that request. Please try again.