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.
This commit is contained in:
Thomas Wouters 2006-04-21 10:40:58 +00:00
parent 9ada3d6e29
commit 49fd7fa443
640 changed files with 52240 additions and 18408 deletions

View file

@ -504,7 +504,7 @@ Instance methods:
Return a string representing the date, controlled by an explicit
format string. Format codes referring to hours, minutes or seconds
will see 0 values.
See the section on \method{strftime()} behavior.
See section~\ref{strftime-behavior} -- \method{strftime()} behavior.
\end{methoddesc}
@ -970,8 +970,8 @@ Instance methods:
\begin{methoddesc}{strftime}{format}
Return a string representing the date and time, controlled by an
explicit format string. See the section on \method{strftime()}
behavior.
explicit format string. See section~\ref{strftime-behavior} --
\method{strftime()} behavior.
\end{methoddesc}
@ -1100,7 +1100,8 @@ Instance methods:
\begin{methoddesc}{strftime}{format}
Return a string representing the time, controlled by an explicit
format string. See the section on \method{strftime()} behavior.
format string. See section~\ref{strftime-behavior} --
\method{strftime()} behavior.
\end{methoddesc}
\begin{methoddesc}{utcoffset}{}
@ -1368,7 +1369,7 @@ representing only EST (fixed offset -5 hours), or only EDT (fixed offset
-4 hours)).
\subsection{\method{strftime()} Behavior}
\subsection{\method{strftime()} Behavior\label{strftime-behavior}}
\class{date}, \class{datetime}, and \class{time}
objects all support a \code{strftime(\var{format})}