[Python-checkins] r56889 - in doctools/trunk: Doc-26/c-api/utilities.rst Doc-26/howto/sockets.rst Doc-26/library/mailbox.rst Doc-26/library/os.path.rst Doc-26/library/re.rst Doc-26/library/shlex.rst Doc-3k/c-api/utilities.rst Doc-3k/howto/sockets.rst Doc-3k/library/mailbox.rst Doc-3k/library/os.path.rst Doc-3k/library/re.rst Doc-3k/library/shlex.rst
georg.brandl
python-checkins at python.org
Fri Aug 10 08:10:33 CEST 2007
Author: georg.brandl
Date: Fri Aug 10 08:10:32 2007
New Revision: 56889
Modified:
doctools/trunk/Doc-26/c-api/utilities.rst
doctools/trunk/Doc-26/howto/sockets.rst
doctools/trunk/Doc-26/library/mailbox.rst
doctools/trunk/Doc-26/library/os.path.rst
doctools/trunk/Doc-26/library/re.rst
doctools/trunk/Doc-26/library/shlex.rst
doctools/trunk/Doc-3k/c-api/utilities.rst
doctools/trunk/Doc-3k/howto/sockets.rst
doctools/trunk/Doc-3k/library/mailbox.rst
doctools/trunk/Doc-3k/library/os.path.rst
doctools/trunk/Doc-3k/library/re.rst
doctools/trunk/Doc-3k/library/shlex.rst
Log:
Fix a couple double backslashes and port rev. 56885.
Modified: doctools/trunk/Doc-26/c-api/utilities.rst
==============================================================================
--- doctools/trunk/Doc-26/c-api/utilities.rst (original)
+++ doctools/trunk/Doc-26/c-api/utilities.rst Fri Aug 10 08:10:32 2007
@@ -954,8 +954,8 @@
guarantee consistent behavior in corner cases, which the Standard C functions do
not.
-The wrappers ensure that *str*[*size*-1] is always ``'\\0'`` upon return. They
-never write more than *size* bytes (including the trailing ``'\\0'`` into str.
+The wrappers ensure that *str*[*size*-1] is always ``'\0'`` upon return. They
+never write more than *size* bytes (including the trailing ``'\0'`` into str.
Both functions require that ``str != NULL``, ``size > 0`` and ``format !=
NULL``.
Modified: doctools/trunk/Doc-26/howto/sockets.rst
==============================================================================
--- doctools/trunk/Doc-26/howto/sockets.rst (original)
+++ doctools/trunk/Doc-26/howto/sockets.rst Fri Aug 10 08:10:32 2007
@@ -204,7 +204,7 @@
while totalsent < MSGLEN:
sent = self.sock.send(msg[totalsent:])
if sent == 0:
- raise RuntimeError, \\
+ raise RuntimeError, \
"socket connection broken"
totalsent = totalsent + sent
@@ -213,7 +213,7 @@
while len(msg) < MSGLEN:
chunk = self.sock.recv(MSGLEN-len(msg))
if chunk == '':
- raise RuntimeError, \\
+ raise RuntimeError, \
"socket connection broken"
msg = msg + chunk
return msg
@@ -341,7 +341,7 @@
it's close enough to the C version that if you understand ``select`` in Python,
you'll have little trouble with it in C. ::
- ready_to_read, ready_to_write, in_error = \\
+ ready_to_read, ready_to_write, in_error = \
select.select(
potential_readers,
potential_writers,
Modified: doctools/trunk/Doc-26/library/mailbox.rst
==============================================================================
--- doctools/trunk/Doc-26/library/mailbox.rst (original)
+++ doctools/trunk/Doc-26/library/mailbox.rst Fri Aug 10 08:10:32 2007
@@ -612,9 +612,9 @@
Babyl is a single-file mailbox format used by the Rmail mail user agent included
with Emacs. The beginning of a message is indicated by a line containing the two
-characters Control-Underscore (``'\\037'``) and Control-L (``'\\014'``). The end
+characters Control-Underscore (``'\037'``) and Control-L (``'\014'``). The end
of a message is indicated by the start of the next message or, in the case of
-the last message, a line containing a Control-Underscore (``'\\037'``)
+the last message, a line containing a Control-Underscore (``'\037'``)
character.
Messages in a Babyl mailbox have two sets of headers, original headers and
@@ -687,7 +687,7 @@
MMDF is a single-file mailbox format invented for the Multichannel Memorandum
Distribution Facility, a mail transfer agent. Each message is in the same form
as an mbox message but is bracketed before and after by lines containing four
-Control-A (``'\\001'``) characters. As with the mbox format, the beginning of
+Control-A (``'\001'``) characters. As with the mbox format, the beginning of
each message is indicated by a line whose first five characters are "From ", but
additional occurrences of "From " are not transformed to ">From " when storing
messages because the extra message separator lines prevent mistaking such
Modified: doctools/trunk/Doc-26/library/os.path.rst
==============================================================================
--- doctools/trunk/Doc-26/library/os.path.rst (original)
+++ doctools/trunk/Doc-26/library/os.path.rst Fri Aug 10 08:10:32 2007
@@ -183,7 +183,7 @@
directory separator (``os.sep``) inserted between components, unless *path2* is
empty. Note that on Windows, since there is a current directory for each drive,
:func:`os.path.join("c:", "foo")` represents a path relative to the current
- directory on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\\\foo`.
+ directory on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\foo`.
.. function:: normcase(path)
Modified: doctools/trunk/Doc-26/library/re.rst
==============================================================================
--- doctools/trunk/Doc-26/library/re.rst (original)
+++ doctools/trunk/Doc-26/library/re.rst Fri Aug 10 08:10:32 2007
@@ -92,7 +92,7 @@
Matches the end of the string or just before the newline at the end of the
string, and in :const:`MULTILINE` mode also matches before a newline. ``foo``
matches both 'foo' and 'foobar', while the regular expression ``foo$`` matches
- only 'foo'. More interestingly, searching for ``foo.$`` in 'foo1\\nfoo2\\n'
+ only 'foo'. More interestingly, searching for ``foo.$`` in ``'foo1\nfoo2\n'``
matches 'foo2' normally, but 'foo1' in :const:`MULTILINE` mode.
``'*'``
Modified: doctools/trunk/Doc-26/library/shlex.rst
==============================================================================
--- doctools/trunk/Doc-26/library/shlex.rst (original)
+++ doctools/trunk/Doc-26/library/shlex.rst Fri Aug 10 08:10:32 2007
@@ -177,7 +177,7 @@
.. attribute:: shlex.escape
Characters that will be considered as escape. This will be only used in POSIX
- mode, and includes just ``'\\'`` by default.
+ mode, and includes just ``'\'`` by default.
.. versionadded:: 2.3
@@ -288,7 +288,7 @@
* Quotes are stripped out, and do not separate words (``"Do"Not"Separate"`` is
parsed as the single word ``DoNotSeparate``);
-* Non-quoted escape characters (e.g. ``'\\'``) preserve the literal value of the
+* Non-quoted escape characters (e.g. ``'\'``) preserve the literal value of the
next character that follows;
* Enclosing characters in quotes which are not part of :attr:`escapedquotes`
Modified: doctools/trunk/Doc-3k/c-api/utilities.rst
==============================================================================
--- doctools/trunk/Doc-3k/c-api/utilities.rst (original)
+++ doctools/trunk/Doc-3k/c-api/utilities.rst Fri Aug 10 08:10:32 2007
@@ -967,8 +967,8 @@
guarantee consistent behavior in corner cases, which the Standard C functions do
not.
-The wrappers ensure that *str*[*size*-1] is always ``'\\0'`` upon return. They
-never write more than *size* bytes (including the trailing ``'\\0'`` into str.
+The wrappers ensure that *str*[*size*-1] is always ``'\0'`` upon return. They
+never write more than *size* bytes (including the trailing ``'\0'``) into str.
Both functions require that ``str != NULL``, ``size > 0`` and ``format !=
NULL``.
Modified: doctools/trunk/Doc-3k/howto/sockets.rst
==============================================================================
--- doctools/trunk/Doc-3k/howto/sockets.rst (original)
+++ doctools/trunk/Doc-3k/howto/sockets.rst Fri Aug 10 08:10:32 2007
@@ -204,7 +204,7 @@
while totalsent < MSGLEN:
sent = self.sock.send(msg[totalsent:])
if sent == 0:
- raise RuntimeError, \\
+ raise RuntimeError, \
"socket connection broken"
totalsent = totalsent + sent
@@ -213,7 +213,7 @@
while len(msg) < MSGLEN:
chunk = self.sock.recv(MSGLEN-len(msg))
if chunk == '':
- raise RuntimeError, \\
+ raise RuntimeError, \
"socket connection broken"
msg = msg + chunk
return msg
@@ -341,7 +341,7 @@
it's close enough to the C version that if you understand ``select`` in Python,
you'll have little trouble with it in C. ::
- ready_to_read, ready_to_write, in_error = \\
+ ready_to_read, ready_to_write, in_error = \
select.select(
potential_readers,
potential_writers,
Modified: doctools/trunk/Doc-3k/library/mailbox.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/mailbox.rst (original)
+++ doctools/trunk/Doc-3k/library/mailbox.rst Fri Aug 10 08:10:32 2007
@@ -612,9 +612,9 @@
Babyl is a single-file mailbox format used by the Rmail mail user agent included
with Emacs. The beginning of a message is indicated by a line containing the two
-characters Control-Underscore (``'\\037'``) and Control-L (``'\\014'``). The end
+characters Control-Underscore (``'\037'``) and Control-L (``'\014'``). The end
of a message is indicated by the start of the next message or, in the case of
-the last message, a line containing a Control-Underscore (``'\\037'``)
+the last message, a line containing a Control-Underscore (``'\037'``)
character.
Messages in a Babyl mailbox have two sets of headers, original headers and
@@ -687,7 +687,7 @@
MMDF is a single-file mailbox format invented for the Multichannel Memorandum
Distribution Facility, a mail transfer agent. Each message is in the same form
as an mbox message but is bracketed before and after by lines containing four
-Control-A (``'\\001'``) characters. As with the mbox format, the beginning of
+Control-A (``'\001'``) characters. As with the mbox format, the beginning of
each message is indicated by a line whose first five characters are "From ", but
additional occurrences of "From " are not transformed to ">From " when storing
messages because the extra message separator lines prevent mistaking such
Modified: doctools/trunk/Doc-3k/library/os.path.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/os.path.rst (original)
+++ doctools/trunk/Doc-3k/library/os.path.rst Fri Aug 10 08:10:32 2007
@@ -183,7 +183,7 @@
directory separator (``os.sep``) inserted between components, unless *path2* is
empty. Note that on Windows, since there is a current directory for each drive,
:func:`os.path.join("c:", "foo")` represents a path relative to the current
- directory on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\\\foo`.
+ directory on drive :file:`C:` (:file:`c:foo`), not :file:`c:\\foo`.
.. function:: normcase(path)
Modified: doctools/trunk/Doc-3k/library/re.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/re.rst (original)
+++ doctools/trunk/Doc-3k/library/re.rst Fri Aug 10 08:10:32 2007
@@ -92,7 +92,7 @@
Matches the end of the string or just before the newline at the end of the
string, and in :const:`MULTILINE` mode also matches before a newline. ``foo``
matches both 'foo' and 'foobar', while the regular expression ``foo$`` matches
- only 'foo'. More interestingly, searching for ``foo.$`` in 'foo1\\nfoo2\\n'
+ only 'foo'. More interestingly, searching for ``foo.$`` in ``'foo1\nfoo2\n'``
matches 'foo2' normally, but 'foo1' in :const:`MULTILINE` mode.
``'*'``
Modified: doctools/trunk/Doc-3k/library/shlex.rst
==============================================================================
--- doctools/trunk/Doc-3k/library/shlex.rst (original)
+++ doctools/trunk/Doc-3k/library/shlex.rst Fri Aug 10 08:10:32 2007
@@ -177,7 +177,7 @@
.. attribute:: shlex.escape
Characters that will be considered as escape. This will be only used in POSIX
- mode, and includes just ``'\\'`` by default.
+ mode, and includes just ``'\'`` by default.
.. versionadded:: 2.3
@@ -288,7 +288,7 @@
* Quotes are stripped out, and do not separate words (``"Do"Not"Separate"`` is
parsed as the single word ``DoNotSeparate``);
-* Non-quoted escape characters (e.g. ``'\\'``) preserve the literal value of the
+* Non-quoted escape characters (e.g. ``'\'``) preserve the literal value of the
next character that follows;
* Enclosing characters in quotes which are not part of :attr:`escapedquotes`
More information about the Python-checkins
mailing list