[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3
georg.brandl
python-checkins at python.org
Tue Oct 29 08:18:54 CET 2013
http://hg.python.org/cpython/rev/28690d72b99f
changeset: 86731:28690d72b99f
parent: 86723:1386fb31c0ed
parent: 86730:321b665d8c3c
user: Georg Brandl <georg at python.org>
date: Tue Oct 29 08:17:08 2013 +0100
summary:
merge with 3.3
files:
Doc/howto/unicode.rst | 2 +-
Doc/library/curses.rst | 2 +-
Doc/library/datetime.rst | 2 +-
Doc/library/nntplib.rst | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -514,7 +514,7 @@
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
-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.
One problem is the multi-byte nature of encodings; one Unicode character can be
diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -377,7 +377,7 @@
is to be displayed.
-.. function:: newwin(begin_y, begin_x)
+.. function:: newwin(nlines, ncols)
newwin(nlines, ncols, begin_y, begin_x)
Return a new window, whose left-upper corner is at ``(begin_y, begin_x)``, and
diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1898,7 +1898,7 @@
making assumptions about the output value. Field orderings will vary (for
example, "month/day/year" versus "day/month/year"), and the output may
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`
to determine the current locale's encoding).
diff --git a/Doc/library/nntplib.rst b/Doc/library/nntplib.rst
--- a/Doc/library/nntplib.rst
+++ b/Doc/library/nntplib.rst
@@ -394,18 +394,18 @@
.. method:: NNTP.next()
- Send a ``NEXT`` command. Return as for :meth:`stat`.
+ Send a ``NEXT`` command. Return as for :meth:`.stat`.
.. 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)
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*,
*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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list