merge stable into default

CHANGES

@@ -6,6 +6,20 @@ Release 1.2 (in development)
 * PR#35: Added Slovak translation.
 
 
+Release 1.1.3 (in development)
+==============================
+
+* PR#40: Fix ``safe_repr`` function to decode bytestrings with non-ASCII
+  characters correctly.
+
+* PR#37: Allow configuring sphinx-apidoc via ``SPHINX_APIDOC_OPTIONS``.
+
+* PR#34: Restore Python 2.4 compatibility.
+
+* PR#36: Make the "bibliography to TOC" fix in LaTeX output specific to
+  the document class.
+
+
 Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway!
 ======================================================================
 

sphinx/apidoc.py

@@ -20,12 +20,15 @@ import optparse
 from os import path
 
 # automodule options
-OPTIONS = [
+if 'SPHINX_APIDOC_OPTIONS' in os.environ:
-    'members',
+    OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',')
-    'undoc-members',
+else:
-    # 'inherited-members', # disabled because there's a bug in sphinx
+    OPTIONS = [
-    'show-inheritance',
+        'members',
-]
+        'undoc-members',
+        # 'inherited-members', # disabled because there's a bug in sphinx
+        'show-inheritance',
+    ]
 
 INITPY = '__init__.py'
 

sphinx/util/inspect.py

@@ -15,6 +15,8 @@ import sys
 # relatively import this module
 inspect = __import__('inspect')
 
+from sphinx.util import force_decode
+
 
 if sys.version_info >= (2, 5):
     from functools import partial
@@ -87,4 +89,4 @@ def safe_repr(object):
         s = repr(object)
     except Exception:
         raise ValueError
-    return s.replace('\n', ' ')
+    return force_decode(s, None).replace('\n', ' ')