[Python-checkins] distutils2: Be compatible with Sphinx 0.6 in addition to 1.0

[tarek.ziade]

tarek.ziade pushed cb1b9898d0b8 to distutils2:

http://hg.python.org/distutils2/rev/cb1b9898d0b8
changeset:   717:cb1b9898d0b8
user:        ?ric Araujo <merwok at netwok.org>
date:        Thu Sep 30 17:46:38 2010 +0200
summary:     Be compatible with Sphinx 0.6 in addition to 1.0
files:       docs/source/conf.py

diff --git a/docs/source/conf.py b/docs/source/conf.py
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -12,7 +12,9 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
+import sys
+import sphinx
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -98,7 +100,8 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {'collapsiblesidebar': True}
+if sphinx.__version__[:3] >= '1.0':
+    html_theme_options = {'collapsiblesidebar': True}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []

--
Repository URL: http://hg.python.org/distutils2