diff options
| author | Georg Brandl <georg@python.org> | 2014-09-30 20:17:48 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-09-30 20:17:48 (GMT) |
| commit | 7552eb89b91e6edaec926ac7a66db32e1d45d499 (patch) | |
| tree | 3fdce0749f06e5f8438043d230214165020b0049 /Doc/tools | |
| parent | 8de5b40fc2c0cbe8aae82ea3ea9e020fb0f675a4 (diff) | |
| parent | bae334cda9e1f75c55f98842d3758bf14be26d76 (diff) | |
| download | cpython-7552eb89b91e6edaec926ac7a66db32e1d45d499.zip cpython-7552eb89b91e6edaec926ac7a66db32e1d45d499.tar.gz cpython-7552eb89b91e6edaec926ac7a66db32e1d45d499.tar.bz2 | |
merge with 3.4
Diffstat (limited to 'Doc/tools')
| -rw-r--r-- | Doc/tools/sphinxext/c_annotations.py | 3 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/pyspecific.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Doc/tools/sphinxext/c_annotations.py b/Doc/tools/sphinxext/c_annotations.py index cf9ad9e..baa39f3 100644 --- a/Doc/tools/sphinxext/c_annotations.py +++ b/Doc/tools/sphinxext/c_annotations.py @@ -13,7 +13,7 @@ Usage: Set the `refcount_file` config value to the path to the reference count data file. - :copyright: Copyright 2007-2013 by Georg Brandl. + :copyright: Copyright 2007-2014 by Georg Brandl. :license: Python license. """ @@ -118,3 +118,4 @@ def setup(app): signode.parent['stableabi'] = 'stableabi' in self.options return old_handle_signature(self, sig, signode) CObject.handle_signature = new_handle_signature + return {'version': '1.0', 'parallel_read_safe': True} diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py index a03096c..a5ee8c2 100644 --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -345,3 +345,4 @@ def setup(app): app.add_directive_to_domain('py', 'decorator', PyDecoratorFunction) app.add_directive_to_domain('py', 'decoratormethod', PyDecoratorMethod) app.add_directive('miscnews', MiscNews) + return {'version': '1.0', 'parallel_read_safe': True} |