Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge with 3.4

This commit is contained in:
Georg Brandl 2014-09-30 22:17:48 +02:00
parent 8de5b40fc2 bae334cda9
commit 7552eb89b9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Doc/tools/sphinxext/c_annotations.py
View File

@ -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}

1
Doc/tools/sphinxext/pyspecific.py
View File

@ -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}