From f60930634978e49e97112fc4253f4a5d425c9950 Mon Sep 17 00:00:00 2001
From: Ramiro Morales <cramm0@gmail.com>
Date: Fri, 19 Nov 2010 23:19:56 +0000
Subject: [PATCH] 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
---
 docs/_ext/djangodocs.py | 10 ++--------
 docs/conf.py            |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index 7f642592a5..898a2ee2be 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -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):
diff --git a/docs/conf.py b/docs/conf.py
index f5378c50bf..6136259ad3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -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.