IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge with stable

Browse Source
This commit is contained in:
Takayuki Shimizukawa 2014-09-02 00:11:32 +09:00
commit 7207b614b6
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -225,8 +225,8 @@ Documentation
* Extended the :ref:`documentation about building extensions <dev-extensions>`. * Extended the :ref:`documentation about building extensions <dev-extensions>`.
Release 1.2.3 (in development) Release 1.2.3 (released Sep 1, 2014)
============================== ====================================
Features added Features added
-------------- --------------

3
setup.py
View File

@ -130,7 +130,8 @@ else:
jscatalog = {} jscatalog = {}
for message in catalog: for message in catalog:
if any(x[0].endswith(('.js', '.js_t', '.html')) for x in message.locations): if any(x[0].endswith(('.js', '.js_t', '.html'))
for x in message.locations):
msgid = message.id msgid = message.id
if isinstance(msgid, (list, tuple)): if isinstance(msgid, (list, tuple)):
msgid = msgid[0] msgid = msgid[0]

3
sphinx/ext/autosummary/__init__.py
View File

@ -276,7 +276,8 @@ class Autosummary(Directive):
# be cached anyway) # be cached anyway)
documenter.analyzer.find_attr_docs() documenter.analyzer.find_attr_docs()
except PycodeError as err: except PycodeError as err:
documenter.env.app.debug('[autodoc] module analyzer failed: %s', err) documenter.env.app.debug(
'[autodoc] module analyzer failed: %s', err)
# no source file -- e.g. for builtin and C modules # no source file -- e.g. for builtin and C modules
documenter.analyzer = None documenter.analyzer = None