mirror of https://github.com/python/cpython.git
Issue #17047: remove doubled words added in 3.3
as reported by Serhiy Storchaka and Matthew Barnett.
This commit is contained in:
parent
98472b8396
commit
0f84764a09
|
@ -327,7 +327,7 @@ added matters. To illustrate::
|
|||
each resulting line to the ``max_line_length``. If ``cte_type`` is
|
||||
``7bit``, non-ascii binary data is CTE encoded using the ``unknown-8bit``
|
||||
charset. Otherwise the original source header is used, with its existing
|
||||
line breaks and and any (RFC invalid) binary data it may contain.
|
||||
line breaks and any (RFC invalid) binary data it may contain.
|
||||
|
||||
|
||||
.. note::
|
||||
|
|
|
@ -393,7 +393,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
|
|||
.. attribute:: is_link_local
|
||||
|
||||
These attributes are true for the network as a whole if they are true
|
||||
true for both the network address and the broadcast address
|
||||
for both the network address and the broadcast address
|
||||
|
||||
.. attribute:: network_address
|
||||
|
||||
|
@ -452,7 +452,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
|
|||
.. method:: overlaps(other)
|
||||
|
||||
``True`` if this network is partly or wholly contained in *other* or
|
||||
or *other* is wholly contained in this network.
|
||||
*other* is wholly contained in this network.
|
||||
|
||||
.. method:: address_exclude(network)
|
||||
|
||||
|
@ -582,7 +582,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
|
|||
.. attribute:: is_site_local
|
||||
|
||||
These attribute is true for the network as a whole if it is true
|
||||
true for both the network address and the broadcast address
|
||||
for both the network address and the broadcast address
|
||||
|
||||
|
||||
Operators
|
||||
|
|
|
@ -2637,7 +2637,7 @@ copying.
|
|||
>>> z.nbytes
|
||||
48
|
||||
|
||||
Cast 1D/unsigned char to to 2D/unsigned long::
|
||||
Cast 1D/unsigned char to 2D/unsigned long::
|
||||
|
||||
>>> buf = struct.pack("L"*6, *list(range(6)))
|
||||
>>> x = memoryview(buf)
|
||||
|
|
|
@ -988,7 +988,7 @@ patch
|
|||
you pass in `create=True`, and the attribute doesn't exist, patch will
|
||||
create the attribute for you when the patched function is called, and
|
||||
delete it again afterwards. This is useful for writing tests against
|
||||
attributes that your production code creates at runtime. It is off by by
|
||||
attributes that your production code creates at runtime. It is off by
|
||||
default because it can be dangerous. With it switched on you can write
|
||||
passing tests against APIs that don't actually exist!
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# cte (Content Transfer Encoding) is either 'q' or 'b' (ignoring case). In
|
||||
# theory other letters could be used for other encodings, but in practice this
|
||||
# (almost?) never happens. There could be a public API for adding entries
|
||||
# to to the CTE tables, but YAGNI for now. 'q' is Quoted Printable, 'b' is
|
||||
# to the CTE tables, but YAGNI for now. 'q' is Quoted Printable, 'b' is
|
||||
# Base64. The meaning of encoded_string should be obvious. 'lang' is optional
|
||||
# as indicated by the brackets (they are not part of the syntax) but is almost
|
||||
# never encountered in practice.
|
||||
|
|
|
@ -1864,7 +1864,7 @@ def get_dtext(value):
|
|||
""" dtext = <printable ascii except \ [ ]> / obs-dtext
|
||||
obs-dtext = obs-NO-WS-CTL / quoted-pair
|
||||
|
||||
We allow anything except the excluded characters, but but if we find any
|
||||
We allow anything except the excluded characters, but if we find any
|
||||
ASCII other than the RFC defined printable ASCII an NonPrintableDefect is
|
||||
added to the token's defects list. Quoted pairs are converted to their
|
||||
unquoted values, so what is returned is a ptext token, in this case a
|
||||
|
|
|
@ -26,7 +26,7 @@ def __init__(self, _text, _subtype='plain', _charset=None):
|
|||
Content-Transfer-Encoding header will also be set.
|
||||
"""
|
||||
|
||||
# If no _charset was specified, check to see see if there are non-ascii
|
||||
# If no _charset was specified, check to see if there are non-ascii
|
||||
# characters present. If not, use 'us-ascii', otherwise use utf-8.
|
||||
# XXX: This can be removed once #7304 is fixed.
|
||||
if _charset is None:
|
||||
|
|
|
@ -23,7 +23,7 @@ class EmailPolicy(Policy):
|
|||
"""+
|
||||
PROVISIONAL
|
||||
|
||||
The API extensions enabled by this this policy are currently provisional.
|
||||
The API extensions enabled by this policy are currently provisional.
|
||||
Refer to the documentation for details.
|
||||
|
||||
This policy adds new header parsing and folding algorithms. Instead of
|
||||
|
|
|
@ -4492,7 +4492,7 @@ def test_py_exact_power(self):
|
|||
x = Decimal(2**578) ** Decimal("-0.5")
|
||||
|
||||
def test_py_immutability_operations(self):
|
||||
# Do operations and check that it didn't change change internal objects.
|
||||
# Do operations and check that it didn't change internal objects.
|
||||
Decimal = P.Decimal
|
||||
DefaultContext = P.DefaultContext
|
||||
setcontext = P.setcontext
|
||||
|
|
|
@ -3152,7 +3152,7 @@ def mark_previous(self, index):
|
|||
def peer_create(self, newPathName, cnf={}, **kw): # new in Tk 8.5
|
||||
"""Creates a peer text widget with the given newPathName, and any
|
||||
optional standard configuration options. By default the peer will
|
||||
have the same start and and end line as the parent widget, but
|
||||
have the same start and end line as the parent widget, but
|
||||
these can be overriden with the standard configuration options."""
|
||||
self.tk.call(self._w, 'peer', 'create', newPathName,
|
||||
*self._options(cnf, kw))
|
||||
|
|
|
@ -1417,7 +1417,7 @@ def patch(
|
|||
you pass in `create=True`, and the attribute doesn't exist, patch will
|
||||
create the attribute for you when the patched function is called, and
|
||||
delete it again afterwards. This is useful for writing tests against
|
||||
attributes that your production code creates at runtime. It is off by by
|
||||
attributes that your production code creates at runtime. It is off by
|
||||
default because it can be dangerous. With it switched on you can write
|
||||
passing tests against APIs that don't actually exist!
|
||||
|
||||
|
|
|
@ -3609,7 +3609,7 @@ sock_sendmsg(PySocketSockObject *s, PyObject *args)
|
|||
the next header, it checks its (uninitialized) cmsg_len
|
||||
member to see if the "message" fits in the buffer, and
|
||||
returns NULL if it doesn't. Zero-filling the buffer
|
||||
ensures that that doesn't happen. */
|
||||
ensures that this doesn't happen. */
|
||||
memset(controlbuf, 0, controllen);
|
||||
|
||||
for (i = 0; i < ncmsgbufs; i++) {
|
||||
|
|
Loading…
Reference in New Issue