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/libzipfile.tex b/Doc/lib/libzipfile.tex
index 32ca3e0..4e06ef6 100644
--- a/Doc/lib/libzipfile.tex
+++ b/Doc/lib/libzipfile.tex
@@ -141,10 +141,17 @@
Write the file named \var{filename} to the archive, giving it the
archive name \var{arcname} (by default, this will be the same as
\var{filename}, but without a drive letter and with leading path
- separators removed). If given, \var{compress_type} overrides the value
- given for the \var{compression} parameter to the constructor for
- the new entry. The archive must be open with mode \code{'w'} or
- \code{'a'}.
+ separators removed). If given, \var{compress_type} overrides the
+ value given for the \var{compression} parameter to the constructor
+ for the new entry. The archive must be open with mode \code{'w'}
+ or \code{'a'}.
+
+ \note{There is no official file name encoding for ZIP files.
+ If you have unicode file names, please convert them to byte strings
+ in your desired encoding before passing them to \method{write()}.
+ WinZip interprets all file names as encoded in CP437, also known
+ as DOS Latin.}
+
\note{Archive names should be relative to the archive root, that is,
they should not start with a path separator.}
\end{methoddesc}