[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3
georg.brandl
python-checkins at python.org
Sat Oct 12 22:56:42 CEST 2013
http://hg.python.org/cpython/rev/fc09e5cff7ea
changeset: 86260:fc09e5cff7ea
parent: 86249:7c8f7174deff
parent: 86259:faf318b53d58
user: Georg Brandl <georg at python.org>
date: Sat Oct 12 22:56:37 2013 +0200
summary:
merge with 3.3
files:
.hgeol | 3 ++
Doc/tools/sphinxext/c_annotations.py | 12 +++++-----
Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css | 4 +-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.hgeol b/.hgeol
--- a/.hgeol
+++ b/.hgeol
@@ -10,6 +10,8 @@
**.vsprops = BIN
**.aif = BIN
+**.aifc = BIN
+**.aiff = BIN
**.au = BIN
**.bmp = BIN
**.db = BIN
@@ -23,6 +25,7 @@
**.png = BIN
**.psd = BIN
**.tar = BIN
+**.wav = BIN
**.xar = BIN
**.zip = BIN
diff --git a/Doc/tools/sphinxext/c_annotations.py b/Doc/tools/sphinxext/c_annotations.py
--- a/Doc/tools/sphinxext/c_annotations.py
+++ b/Doc/tools/sphinxext/c_annotations.py
@@ -73,10 +73,10 @@
par = node.parent
if par['domain'] != 'c':
continue
- if par['notlimited']:
- node.insert(0, nodes.emphasis(' Not part of the stable API.',
- ' Not part of the stable API.',
- classes=['notlimited']))
+ if par['stableabi']:
+ node.insert(0, nodes.emphasis(' Part of the stable ABI.',
+ ' Part of the stable ABI.',
+ classes=['stableabi']))
if par['objtype'] != 'function':
continue
if not par[0].has_key('names') or not par[0]['names']:
@@ -108,10 +108,10 @@
# monkey-patch C object...
CObject.option_spec = {
'noindex': directives.flag,
- 'notlimited': directives.flag,
+ 'stableabi': directives.flag,
}
old_handle_signature = CObject.handle_signature
def new_handle_signature(self, sig, signode):
- signode.parent['notlimited'] = 'notlimited' in self.options
+ signode.parent['stableabi'] = 'stableabi' in self.options
return old_handle_signature(self, sig, signode)
CObject.handle_signature = new_handle_signature
diff --git a/Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css b/Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css
--- a/Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css
+++ b/Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css
@@ -173,6 +173,6 @@
color: #060;
}
-.notlimited {
- color: #922;
+.stableabi {
+ color: #229;
}
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list