Skip to content

Commit 8b53559

Browse files
terryjreedyterryjreedy
committed
Merge with 3.3, issue python#17047: remove doubled words added in 3.3,
as reported by Serhiy Storchaka and Matthew Barnett.
2 parents 16b5c13 + 0f84764 commit 8b53559

12 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎Doc/library/email.policy.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ added matters. To illustrate::
327327
each resulting line to the ``max_line_length``. If ``cte_type`` is
328328
``7bit``, non-ascii binary data is CTE encoded using the ``unknown-8bit``
329329
charset. Otherwise the original source header is used, with its existing
330-
line breaks and and any (RFC invalid) binary data it may contain.
330+
line breaks and any (RFC invalid) binary data it may contain.
331331

332332

333333
.. note::

‎Doc/library/ipaddress.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
393393
.. attribute:: is_link_local
394394

395395
These attributes are true for the network as a whole if they are true
396-
true for both the network address and the broadcast address
396+
for both the network address and the broadcast address
397397

398398
.. attribute:: network_address
399399

@@ -452,7 +452,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
452452
.. method:: overlaps(other)
453453

454454
``True`` if this network is partly or wholly contained in *other* or
455-
or *other* is wholly contained in this network.
455+
*other* is wholly contained in this network.
456456

457457
.. method:: address_exclude(network)
458458

@@ -582,7 +582,7 @@ so to avoid duplication they are only documented for :class:`IPv4Network`.
582582
.. attribute:: is_site_local
583583

584584
These attribute is true for the network as a whole if it is true
585-
true for both the network address and the broadcast address
585+
for both the network address and the broadcast address
586586

587587

588588
Operators

‎Doc/library/stdtypes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2637,7 +2637,7 @@ copying.
26372637
>>> z.nbytes
26382638
48
26392639

2640-
Cast 1D/unsigned char to to 2D/unsigned long::
2640+
Cast 1D/unsigned char to 2D/unsigned long::
26412641

26422642
>>> buf = struct.pack("L"*6, *list(range(6)))
26432643
>>> x = memoryview(buf)

‎Doc/library/unittest.mock.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ patch
10081008
you pass in `create=True`, and the attribute doesn't exist, patch will
10091009
create the attribute for you when the patched function is called, and
10101010
delete it again afterwards. This is useful for writing tests against
1011-
attributes that your production code creates at runtime. It is off by by
1011+
attributes that your production code creates at runtime. It is off by
10121012
default because it can be dangerous. With it switched on you can write
10131013
passing tests against APIs that don't actually exist!
10141014

‎Lib/email/_encoded_words.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# cte (Content Transfer Encoding) is either 'q' or 'b' (ignoring case). In
1515
# theory other letters could be used for other encodings, but in practice this
1616
# (almost?) never happens. There could be a public API for adding entries
17-
# to to the CTE tables, but YAGNI for now. 'q' is Quoted Printable, 'b' is
17+
# to the CTE tables, but YAGNI for now. 'q' is Quoted Printable, 'b' is
1818
# Base64. The meaning of encoded_string should be obvious. 'lang' is optional
1919
# as indicated by the brackets (they are not part of the syntax) but is almost
2020
# never encountered in practice.

‎Lib/email/_header_value_parser.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1863,7 +1863,7 @@ def get_dtext(value):
18631863
""" dtext = <printable ascii except \ [ ]> / obs-dtext
18641864
obs-dtext = obs-NO-WS-CTL / quoted-pair
18651865
1866-
We allow anything except the excluded characters, but but if we find any
1866+
We allow anything except the excluded characters, but if we find any
18671867
ASCII other than the RFC defined printable ASCII an NonPrintableDefect is
18681868
added to the token's defects list. Quoted pairs are converted to their
18691869
unquoted values, so what is returned is a ptext token, in this case a

‎Lib/email/mime/text.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self, _text, _subtype='plain', _charset=None):
2626
Content-Transfer-Encoding header will also be set.
2727
"""
2828

29-
# If no _charset was specified, check to see see if there are non-ascii
29+
# If no _charset was specified, check to see if there are non-ascii
3030
# characters present. If not, use 'us-ascii', otherwise use utf-8.
3131
# XXX: This can be removed once #7304 is fixed.
3232
if _charset is None:

‎Lib/email/policy.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class EmailPolicy(Policy):
2323
"""+
2424
PROVISIONAL
2525
26-
The API extensions enabled by this this policy are currently provisional.
26+
The API extensions enabled by this policy are currently provisional.
2727
Refer to the documentation for details.
2828
2929
This policy adds new header parsing and folding algorithms. Instead of

‎Lib/test/test_decimal.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4492,7 +4492,7 @@ def test_py_exact_power(self):
44924492
x = Decimal(2**578) ** Decimal("-0.5")
44934493

44944494
def test_py_immutability_operations(self):
4495-
# Do operations and check that it didn't change change internal objects.
4495+
# Do operations and check that it didn't change internal objects.
44964496
Decimal = P.Decimal
44974497
DefaultContext = P.DefaultContext
44984498
setcontext = P.setcontext

‎Lib/tkinter/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3113,7 +3113,7 @@ def mark_previous(self, index):
31133113
def peer_create(self, newPathName, cnf={}, **kw): # new in Tk 8.5
31143114
"""Creates a peer text widget with the given newPathName, and any
31153115
optional standard configuration options. By default the peer will
3116-
have the same start and and end line as the parent widget, but
3116+
have the same start and end line as the parent widget, but
31173117
these can be overriden with the standard configuration options."""
31183118
self.tk.call(self._w, 'peer', 'create', newPathName,
31193119
*self._options(cnf, kw))

0 commit comments

Comments
 (0)