Merge with 3.3, issue #17047: remove doubled words added in 3.3,

as reported by Serhiy Storchaka and Matthew Barnett.

4 files changed, 4 insertions, 4 deletions

diff --git a/Lib/email/_encoded_words.py b/Lib/email/_encoded_words.py
index e9f6e20..9e0cc75 100644
--- a/Lib/email/_encoded_words.py
+++ b/Lib/email/_encoded_words.py
@@ -14,7 +14,7 @@ to a public API if there is demand.
 # 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.
diff --git a/Lib/email/_header_value_parser.py b/Lib/email/_header_value_parser.py
index b596462..1928505 100644
--- a/Lib/email/_header_value_parser.py
+++ b/Lib/email/_header_value_parser.py
@@ -1863,7 +1863,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
diff --git a/Lib/email/mime/text.py b/Lib/email/mime/text.py
index 80ff950..3b5b09f 100644
--- a/Lib/email/mime/text.py
+++ b/Lib/email/mime/text.py
@@ -26,7 +26,7 @@ class MIMEText(MIMENonMultipart):
         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:
diff --git a/Lib/email/policy.py b/Lib/email/policy.py
index a17f598..38e88af 100644
--- a/Lib/email/policy.py
+++ b/Lib/email/policy.py
@@ -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