Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html
Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:
test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec
This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
diff --git a/Doc/tools/toc2bkm.py b/Doc/tools/toc2bkm.py
index 636459a..ab669ba 100755
--- a/Doc/tools/toc2bkm.py
+++ b/Doc/tools/toc2bkm.py
@@ -44,6 +44,20 @@
INCLUDED_LEVELS = ("chapter", "section", "subsection", "subsubsection")
+class BadSectionNesting(Exception):
+ """Raised for unsupported section level transitions."""
+
+ def __init__(self, level, newsection, path, lineno):
+ self.level = level
+ self.newsection = newsection
+ self.path = path
+ self.lineno = lineno
+
+ def __str__(self):
+ return ("illegal transition from %s to %s at %s (line %s)"
+ % (self.level, self.newsection, self.path, self.lineno))
+
+
def parse_toc(fp, bigpart=None):
toc = top = []
stack = [toc]
@@ -65,7 +79,10 @@
if stype not in INCLUDED_LEVELS:
# we don't want paragraphs & subparagraphs
continue
- direction = _transition_map[(level, stype)]
+ try:
+ direction = _transition_map[(level, stype)]
+ except KeyError:
+ raise BadSectionNesting(level, stype, fp.name, lineno)
if direction == OUTER_TO_INNER:
toc = toc[-1][-1]
stack.insert(0, toc)