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/lib/libpycompile.tex b/Doc/lib/libpycompile.tex
index 0458191..85f0aaa 100644
--- a/Doc/lib/libpycompile.tex
+++ b/Doc/lib/libpycompile.tex
@@ -30,9 +30,10 @@
\code{+} \code{'c'} (\code{'o'} if optimization is enabled in the
current interpreter). If \var{dfile} is specified, it is used as
the name of the source file in error messages instead of \var{file}.
- If \var{doraise} = True, a PyCompileError is raised when an error is
- encountered while compiling \var{file}. If \var{doraise} = False (the default),
- an error string is written to sys.stderr, but no exception is raised.
+ If \var{doraise} is true, a \exception{PyCompileError} is raised when
+ an error is encountered while compiling \var{file}. If \var{doraise}
+ is false (the default), an error string is written to \code{sys.stderr},
+ but no exception is raised.
\end{funcdesc}
\begin{funcdesc}{main}{\optional{args}}