cpython: fd0ac7ba091e (original) (raw)

Mercurial > cpython

changeset 101572:fd0ac7ba091e 3.5

Issue #27125: Remove duplicated words from documentation and comments [#27125]

Martin Panter vadmium+py@gmail.com
date	Mon, 30 May 2016 04:04:50 +0000
parents	8bde7ef688b7
children	e553b5ef7ff3 a96822adeaac
files	Doc/c-api/module.rst Doc/howto/pyporting.rst Doc/library/enum.rst Doc/library/tkinter.tix.rst Doc/library/typing.rst Doc/whatsnew/3.4.rst Doc/whatsnew/3.5.rst Lib/ctypes/macholib/README.ctypes Lib/idlelib/idle_test/README.txt Lib/test/test_dict.py Lib/test/test_socket.py Lib/tkinter/tix.py Misc/HISTORY Misc/NEWS Modules/_ctypes/_ctypes.c Modules/_pickle.c Objects/bytesobject.c
diffstat	17 files changed, 20 insertions(+), 21 deletions(-)[+] [-] Doc/c-api/module.rst 2 Doc/howto/pyporting.rst 2 Doc/library/enum.rst 4 Doc/library/tkinter.tix.rst 2 Doc/library/typing.rst 2 Doc/whatsnew/3.4.rst 2 Doc/whatsnew/3.5.rst 2 Lib/ctypes/macholib/README.ctypes 2 Lib/idlelib/idle_test/README.txt 3 Lib/test/test_dict.py 2 Lib/test/test_socket.py 2 Lib/tkinter/tix.py 4 Misc/HISTORY 4 Misc/NEWS 2 Modules/_ctypes/_ctypes.c 2 Modules/_pickle.c 2 Objects/bytesobject.c 2

line wrap: on

line diff

--- a/Doc/c-api/module.rst +++ b/Doc/c-api/module.rst @@ -129,7 +129,7 @@ which export an initialization function) (where the initialization function is added using :c:func:PyImport_AppendInittab). See :ref:building or :ref:extending-with-embedding for details. -The initialization function can either pass pass a module definition instance +The initialization function can either pass a module definition instance to :c:func:PyModule_Create, and return the resulting module object, or request "multi-phase initialization" by returning the definition struct itself.

--- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -390,7 +390,7 @@ your tests under multiple Python interpr tox with your continuous integration system so that you never accidentally break Python 2 or 3 support. -You may also want to use use the -bb flag with the Python 3 interpreter to +You may also want to use the -bb flag with the Python 3 interpreter to trigger an exception when you are comparing bytes to strings or bytes to an int (the latter is available starting in Python 3.5). By default type-differing comparisons simply return False, but if you made a mistake in your

--- a/Doc/library/enum.rst +++ b/Doc/library/enum.rst @@ -314,8 +314,8 @@ Then:: >>> str(Mood.funky) 'my custom str! 1' -The rules for what is allowed are as follows: names that start and end with a -with a single underscore are reserved by enum and cannot be used; all other +The rules for what is allowed are as follows: names that start and end with +a single underscore are reserved by enum and cannot be used; all other attributes defined within an enumeration will become members of this enumeration, with the exception of special methods (:meth:__str__, :meth:__add__, etc.) and descriptors (methods are also descriptors).

--- a/Doc/library/tkinter.tix.rst +++ b/Doc/library/tkinter.tix.rst @@ -142,7 +142,7 @@ Basic Widgets The LabelEntry[](#l4.5) <http://tix.sourceforge.net/dist/current/man/html/TixCmd/tixLabelEntry.htm>_

widget packages an entry widget and a label into one mega widget. It can be used

widget packages an entry widget and a label into one mega widget. It can be used to simplify the creation of "entry-form" type of interface.

.. Python Demo of:

--- a/Doc/library/typing.rst +++ b/Doc/library/typing.rst @@ -297,7 +297,7 @@ The module defines the following classes .. class:: Tuple

Tuple type; Tuple[X, Y] is the is the type of a tuple of two items

Tuple type; Tuple[X, Y] is the type of a tuple of two items with the first item of type X and the second of type Y. Example: Tuple[T1, T2] is a tuple of two elements corresponding

--- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -1322,7 +1322,7 @@ kernel version of 2.6.36 or later and gl ability to query or set the resource limits for processes other than the one making the call. (Contributed by Christian Heimes in :issue:16595.) -On Linux kernel version 2.6.36 or later, there are there are also some new +On Linux kernel version 2.6.36 or later, there are also some new Linux specific constants: :attr:~resource.RLIMIT_MSGQUEUE, :attr:~resource.RLIMIT_NICE, :attr:~resource.RLIMIT_RTPRIO, :attr:~resource.RLIMIT_RTTIME, and :attr:~resource.RLIMIT_SIGPENDING.

--- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -1690,7 +1690,7 @@ messages. (Contributed by Gavin Chappell Both the :meth:SMTP.sendmail() <smtplib.SMTP.sendmail> and :meth:SMTP.send_message() <smtplib.SMTP.send_message> methods now -support support :rfc:6531 (SMTPUTF8). +support :rfc:6531 (SMTPUTF8). (Contributed by Milan Oberkirch and R. David Murray in :issue:22027.)

--- a/Lib/ctypes/macholib/README.ctypes +++ b/Lib/ctypes/macholib/README.ctypes @@ -1,4 +1,4 @@ -Files in this directory from from Bob Ippolito's py2app. +Files in this directory come from Bob Ippolito's py2app. License: Any components of the py2app suite may be distributed under the MIT or PSF open source licenses.

--- a/Lib/idlelib/idle_test/README.txt +++ b/Lib/idlelib/idle_test/README.txt @@ -17,8 +17,7 @@ 1. Test Files The idle directory, idlelib, has over 60 xyz.py files. The idle_test subdirectory should contain a test_xyz.py for each, where 'xyz' is lowercased even if xyz.py is not. Here is a possible template, with the -blanks after after '.' and 'as', and before and after '' to be filled -in. +blanks after '.' and 'as', and before and after '' to be filled in. import unittest from test.support import requires

--- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -861,7 +861,7 @@ class DictTest(unittest.TestCase): itorg = iter(data.items()) d = pickle.dumps(itorg, proto) it = pickle.loads(d)

       # note that the type of type of the unpickled iterator[](#l10.7)

       # note that the type of the unpickled iterator[](#l10.8)
       # is not necessarily the same as the original.  It is[](#l10.9)
       # merely an object supporting the iterator protocol, yielding[](#l10.10)
       # the same objects as the original one.[](#l10.11)

--- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -4747,7 +4747,7 @@ class TIPCThreadableTest(unittest.TestCa self.addCleanup(self.conn.close) def clientSetUp(self):

   # The is a hittable race between serverExplicitReady() and the[](#l11.7)

   # There is a hittable race between serverExplicitReady() and the[](#l11.8)
   # accept() call; sleep a little while to avoid it, otherwise[](#l11.9)
   # we could get an exception[](#l11.10)
   time.sleep(0.1)[](#l11.11)

--- a/Lib/tkinter/tix.py +++ b/Lib/tkinter/tix.py @@ -1052,8 +1052,8 @@ class InputOnly(TixWidget): class LabelEntry(TixWidget): """LabelEntry - Entry field with label. Packages an entry widget

and a label into one mega widget. It can be used be used to simplify
the creation of ``entry-form'' type of interface.

and a label into one mega widget. It can be used to simplify the creation
of ``entry-form'' type of interface.

Subwidgets Class ---------- -----

--- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -10639,8 +10639,8 @@ Core and Builtins certain operations between bytes/buffer and str like str(b'') and comparison. -- The standards streams sys.stdin, stdout and stderr may be None when

the when the C runtime library returns an invalid file descriptor +- The standard streams sys.stdin, stdout and stderr may be None

when the C runtime library returns an invalid file descriptor for the streams (fileno(stdin) < 0). For now this happens only for Windows GUI apps and scripts started with pythonw.exe.

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -3054,7 +3054,7 @@ Library

Issue #22247: Add NNTPError to nntplib.all.
Issue #22366: urllib.request.urlopen will accept a context object
(SSLContext) as an argument which will then used be for HTTPS connection.

(SSLContext) as an argument which will then be used for HTTPS connection. Patch by Alex Gaynor.

Issue #4180: The warnings registries are now reset when the filters

--- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -49,7 +49,7 @@ from_address(addr) from_param(obj) - typecheck and convert a Python object into a C function call parameter

 the result may be an instance of the type, or an integer or tuple[](#l15.7)

 The result may be an instance of the type, or an integer or tuple[](#l15.8)
 (typecode, value[, obj])[](#l15.9)

instance methods/properties

--- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -550,7 +550,7 @@ typedef struct PicklerObject { int bin; /* Boolean, true if proto > 0 / int framing; / True when framing is enabled, proto >= 4 / Py_ssize_t frame_start; / Position in output_buffer where the

                              where the current frame begins. -1 if there[](#l16.7)

                              current frame begins. -1 if there[](#l16.8)
                              is no frame currently open. */[](#l16.9)

Py_ssize_t buf_size; /* Size of the current buffered pickle data */

--- a/Objects/bytesobject.c +++ b/Objects/bytesobject.c @@ -34,7 +34,7 @@ static PyBytesObject *nullstring; For PyBytes_FromString(), the parameter str' points to a null-terminated[](#l17.4) string containing exactly size' bytes.

For PyBytes_FromStringAndSize(), the parameter the parameter `str' is

For PyBytes_FromStringAndSize(), the parameter str' is[](#l17.8) either NULL or else points to a string containing at least size' bytes. For PyBytes_FromStringAndSize(), the string in the `str' parameter does not have to be null-terminated. (Therefore it is safe to construct a