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/libzipimport.tex b/Doc/lib/libzipimport.tex
index 0a60b29..770ea21 100644
--- a/Doc/lib/libzipimport.tex
+++ b/Doc/lib/libzipimport.tex
@@ -69,8 +69,8 @@
\begin{classdesc}{zipimporter}{archivepath}
Create a new zipimporter instance. \var{archivepath} must be a path to
- a zipfile. \class{ZipImportError} is raised if \var{archivepath} doesn't
- point to a valid ZIP archive.
+ a zipfile. \exception{ZipImportError} is raised if \var{archivepath}
+ doesn't point to a valid ZIP archive.
\end{classdesc}
\begin{methoddesc}{find_module}{fullname\optional{, path}}
@@ -83,7 +83,7 @@
\begin{methoddesc}{get_code}{fullname}
Return the code object for the specified module. Raise
- \class{ZipImportError} if the module couldn't be found.
+ \exception{ZipImportError} if the module couldn't be found.
\end{methoddesc}
\begin{methoddesc}{get_data}{pathname}
@@ -93,20 +93,20 @@
\begin{methoddesc}{get_source}{fullname}
Return the source code for the specified module. Raise
- \class{ZipImportError} if the module couldn't be found, return
+ \exception{ZipImportError} if the module couldn't be found, return
\constant{None} if the archive does contain the module, but has
no source for it.
\end{methoddesc}
\begin{methoddesc}{is_package}{fullname}
Return True if the module specified by \var{fullname} is a package.
- Raise \class{ZipImportError} if the module couldn't be found.
+ Raise \exception{ZipImportError} if the module couldn't be found.
\end{methoddesc}
\begin{methoddesc}{load_module}{fullname}
Load the module specified by \var{fullname}. \var{fullname} must be the
fully qualified (dotted) module name. It returns the imported
- module, or raises \class{ZipImportError} if it wasn't found.
+ module, or raises \exception{ZipImportError} if it wasn't found.
\end{methoddesc}
\subsection{Examples}