merge with 3.4

birkenfeld · birkenfeld · commit 7552eb89b91e · 2014-09-30T22:17:48.000+02:00
diff --git 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 new_handle_signature(self, sig, signode):
         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
@@ -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}
