Issue #17047: remove doubled words added in 3.4,

as reported by Serhiy Storchaka and Matthew Barnett.

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 40dc710b1677a05fcbe9967bdf0a7d63bf547b6b..02a626a01a2030942b5014038ba4b4a4d3eda900 100644 (file)
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -824,7 +824,7 @@ to speed up repeated connections from the same clients.
    will not contain return meaningful values nor can they be called safely.
 
    The *server_name_callback* function must return ``None`` to allow the
-   the TLS negotiation to continue.  If a TLS failure is required, a constant
+   TLS negotiation to continue.  If a TLS failure is required, a constant
    :const:`ALERT_DESCRIPTION_* <ALERT_DESCRIPTION_INTERNAL_ERROR>` can be
    returned.  Other return values will result in a TLS fatal error with
    :const:`ALERT_DESCRIPTION_INTERNAL_ERROR`.

diff --git a/Include/pyport.h b/Include/pyport.h
index 8d38ccbc6fa9ef1d5f17c8ce32eecb86cd2b646a..17d9f6d4c892fe0f54a2a629b50c9f1017a7b9a7 100644 (file)
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -881,7 +881,7 @@ extern pid_t forkpty(int *, char *, struct termios *, struct winsize *);
 /*
  * Convenient macros to deal with endianness of the platform. WORDS_BIGENDIAN is
  * detected by configure and defined in pyconfig.h. The code in pyconfig.h
- * also also takes care of Apple's universal builds.
+ * also takes care of Apple's universal builds.
  */
 
 #ifdef WORDS_BIGENDIAN

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 71dfdda00424841b8286040009fc00f3c6de0deb..5ff755c84ab207bbbf16886ccbd1445ef6262dfc 100644 (file)
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -1141,7 +1141,7 @@ class FileType(object):
         - bufsize -- The file's desired buffer size. Accepts the same values as
             the builtin open() function.
         - encoding -- The file's encoding. Accepts the same values as the
-            the builtin open() function.
+            builtin open() function.
         - errors -- A string indicating how encoding and decoding errors are to
             be handled. Accepts the same value as the builtin open() function.
     """

diff --git a/Misc/HISTORY b/Misc/HISTORY
index 68dfedcc0fc66bb489f8d59335c9ece651a0c4da..83421cd47cb9a2f39d35a58b72dff72cd3ec71f7 100644 (file)
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -778,7 +778,7 @@ Library
 
 - Issue #14626: Large refactoring of functions / parameters in the os module.
   Many functions now support "dir_fd" and "follow_symlinks" parameters;
-  some also support accepting an open file descriptor in place of of a path
+  some also support accepting an open file descriptor in place of a path
   string.  Added os.support_* collections as LBYL helpers.  Removed many
   functions only previously seen in 3.3 alpha releases (often starting with
   "f" or "l", or ending with "at").  Originally suggested by Serhiy Storchaka;
@@ -1412,7 +1412,7 @@ Library
 
 - Issue #14399: zipfile now recognizes that the archive has been modified even
   if only the comment is changed.  In addition, the TypeError that results from
-  trying to set a non-binary value as a comment is now now raised at the time
+  trying to set a non-binary value as a comment is now raised at the time
   the comment is set rather than at the time the zipfile is written.
 
 - trace.CoverageResults.is_ignored_filename() now ignores any name that starts
@@ -3052,7 +3052,7 @@ Library
   check or set the MACOSX_DEPLOYMENT_TARGET environment variable for the
   interpreter process.  This could cause failures in non-Distutils subprocesses
   and was unreliable since tests or user programs could modify the interpreter
-  environment after Distutils set it.  Instead, have Distutils set the the
+  environment after Distutils set it.  Instead, have Distutils set the
   deployment target only in the environment of each build subprocess.  It is
   still possible to globally override the default by setting
   MACOSX_DEPLOYMENT_TARGET before launching the interpreter; its value must be