traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-29 08:17:08 +01:00
parent dd371b92c4 3d596fa90b
commit 3a19a89eac
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/howto/unicode.rst
View File

@ -514,7 +514,7 @@ columns and can return Unicode values from an SQL query.
Unicode data is usually converted to a particular encoding before it gets Unicode data is usually converted to a particular encoding before it gets
written to disk or sent over a socket. It's possible to do all the work written to disk or sent over a socket. It's possible to do all the work
yourself: open a file, read an 8-bit bytes object from it, and convert the string yourself: open a file, read an 8-bit bytes object from it, and convert the bytes
with ``bytes.decode(encoding)``. However, the manual approach is not recommended. with ``bytes.decode(encoding)``. However, the manual approach is not recommended.
One problem is the multi-byte nature of encodings; one Unicode character can be One problem is the multi-byte nature of encodings; one Unicode character can be

2
Doc/library/curses.rst
View File

@ -377,7 +377,7 @@ The module :mod:`curses` defines the following functions:
is to be displayed. is to be displayed.
.. function:: newwin(begin_y, begin_x) .. function:: newwin(nlines, ncols)
newwin(nlines, ncols, begin_y, begin_x) newwin(nlines, ncols, begin_y, begin_x)
Return a new window, whose left-upper corner is at ``(begin_y, begin_x)``, and Return a new window, whose left-upper corner is at ``(begin_y, begin_x)``, and

2
Doc/library/datetime.rst
View File

@ -1898,7 +1898,7 @@ Notes:
making assumptions about the output value. Field orderings will vary (for making assumptions about the output value. Field orderings will vary (for
example, "month/day/year" versus "day/month/year"), and the output may example, "month/day/year" versus "day/month/year"), and the output may
contain Unicode characters encoded using the locale's default encoding (for contain Unicode characters encoded using the locale's default encoding (for
example, if the current locale is ``js_JP``, the default encoding could be example, if the current locale is ``ja_JP``, the default encoding could be
any one of ``eucJP``, ``SJIS``, or ``utf-8``; use :meth:`locale.getlocale` any one of ``eucJP``, ``SJIS``, or ``utf-8``; use :meth:`locale.getlocale`
to determine the current locale's encoding). to determine the current locale's encoding).

6
Doc/library/nntplib.rst
View File

@ -394,18 +394,18 @@ tuples or objects that the method normally returns will be empty.
.. method:: NNTP.next() .. method:: NNTP.next()
Send a ``NEXT`` command. Return as for :meth:`stat`. Send a ``NEXT`` command. Return as for :meth:`.stat`.
.. method:: NNTP.last() .. method:: NNTP.last()
Send a ``LAST`` command. Return as for :meth:`stat`. Send a ``LAST`` command. Return as for :meth:`.stat`.
.. method:: NNTP.article(message_spec=None, *, file=None) .. method:: NNTP.article(message_spec=None, *, file=None)
Send an ``ARTICLE`` command, where *message_spec* has the same meaning as Send an ``ARTICLE`` command, where *message_spec* has the same meaning as
for :meth:`stat`. Return a tuple ``(response, info)`` where *info* for :meth:`.stat`. Return a tuple ``(response, info)`` where *info*
is a :class:`~collections.namedtuple` with three attributes *number*, is a :class:`~collections.namedtuple` with three attributes *number*,
*message_id* and *lines* (in that order). *number* is the article number *message_id* and *lines* (in that order). *number* is the article number
in the group (or 0 if the information is not available), *message_id* the in the group (or 0 if the information is not available), *message_id* the