From c04fb56e36999a4162e6ccfe1f9357100abaee99 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Wed, 10 Feb 2016 05:44:01 +0000 Subject: Issue #26304: Change "allows to " to "allows ing" or similar The original form is incorrect grammar and feels awkward, even though the meaning is clear. --- Doc/c-api/arg.rst | 2 +- Doc/c-api/function.rst | 2 +- Doc/howto/pyporting.rst | 4 ++-- Doc/library/asyncio-eventloop.rst | 4 ++-- Doc/library/asyncio-task.rst | 2 +- Doc/library/ctypes.rst | 32 ++++++++++++++++---------------- Doc/library/nis.rst | 6 +++--- Doc/library/signal.rst | 2 +- Doc/library/smtplib.rst | 4 ++-- Doc/library/tarfile.rst | 2 +- Doc/using/cmdline.rst | 2 +- Doc/whatsnew/3.3.rst | 6 +++--- Doc/whatsnew/3.5.rst | 14 +++++++------- Include/object.h | 2 +- Lib/asyncio/futures.py | 2 +- Lib/ctypes/__init__.py | 4 ++-- Lib/test/test_cmd_line_script.py | 2 +- Lib/test/test_doctest.py | 2 +- Lib/test/test_genericpath.py | 2 +- Lib/test/test_strptime.py | 2 +- Lib/tkinter/__init__.py | 4 ++-- Misc/HISTORY | 34 +++++++++++++++++----------------- Misc/NEWS | 12 ++++++------ Modules/_ctypes/_ctypes.c | 2 +- Modules/_ctypes/libffi/m4/libtool.m4 | 2 +- 25 files changed, 76 insertions(+), 76 deletions(-) diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst index f2bb8c6..983d113 100644 --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -30,7 +30,7 @@ variable(s) whose address should be passed. Strings and buffers ------------------- -These formats allow to access an object as a contiguous chunk of memory. +These formats allow accessing an object as a contiguous chunk of memory. You don't have to provide raw storage for the returned unicode or bytes area. Also, you won't have to release any memory yourself, except with the ``es``, ``es#``, ``et`` and ``et#`` formats. diff --git a/Doc/c-api/function.rst b/Doc/c-api/function.rst index ad98322..4c74dc8 100644 --- a/Doc/c-api/function.rst +++ b/Doc/c-api/function.rst @@ -40,7 +40,7 @@ There are a few functions specific to Python functions. .. c:function:: PyObject* PyFunction_NewWithQualName(PyObject *code, PyObject *globals, PyObject *qualname) - As :c:func:`PyFunction_New`, but also allows to set the function object's + As :c:func:`PyFunction_New`, but also allows setting the function object's ``__qualname__`` attribute. *qualname* should be a unicode object or NULL; if NULL, the ``__qualname__`` attribute is set to the same value as its ``__name__`` attribute. diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst index a2aaf36..87b68d4 100644 --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -243,8 +243,8 @@ bothered to add the ``b`` mode when opening a binary file (e.g., ``rb`` for binary reading). Under Python 3, binary files and text files are clearly distinct and mutually incompatible; see the :mod:`io` module for details. Therefore, you **must** make a decision of whether a file will be used for -binary access (allowing to read and/or write binary data) or text access -(allowing to read and/or write text data). You should also use :func:`io.open` +binary access (allowing binary data to be read and/or written) or text access +(allowing text data to be read and/or written). You should also use :func:`io.open` for opening files instead of the built-in :func:`open` function as the :mod:`io` module is consistent from Python 2 to 3 while the built-in :func:`open` function is not (in Python 3 it's actually :func:`io.open`). diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index 01f4228..659b37c 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -253,7 +253,7 @@ Creating connections a class. For example, if you want to use a pre-created protocol instance, you can pass ``lambda: my_protocol``. - Options allowing to change how the connection is created: + Options that change how the connection is created: * *ssl*: if given and not false, a SSL/TLS transport is created (by default a plain TCP transport is created). If *ssl* is @@ -654,7 +654,7 @@ pool of processes). By default, an event loop uses a thread pool executor Error Handling API ------------------ -Allows to customize how exceptions are handled in the event loop. +Allows customizing how exceptions are handled in the event loop. .. method:: BaseEventLoop.set_exception_handler(handler) diff --git a/Doc/library/asyncio-task.rst b/Doc/library/asyncio-task.rst index febb734..fc73c20 100644 --- a/Doc/library/asyncio-task.rst +++ b/Doc/library/asyncio-task.rst @@ -510,7 +510,7 @@ Task functions .. note:: - In the functions below, the optional *loop* argument allows to explicitly set + In the functions below, the optional *loop* argument allows explicitly setting the event loop object used by the underlying task or coroutine. If it's not provided, the default event loop is used. diff --git a/Doc/library/ctypes.rst b/Doc/library/ctypes.rst index 9abd469..3b0c956 100644 --- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -942,7 +942,7 @@ other, and finally follow the pointer chain a few times:: Callback functions ^^^^^^^^^^^^^^^^^^ -:mod:`ctypes` allows to create C callable function pointers from Python callables. +:mod:`ctypes` allows creating C callable function pointers from Python callables. These are sometimes called *callback functions*. First, you must create a class for the callback function. The class knows the @@ -1350,7 +1350,7 @@ details, consult the :manpage:`dlopen(3)` manpage, on Windows, *mode* is ignored. The *use_errno* parameter, when set to True, enables a ctypes mechanism that -allows to access the system :data:`errno` error number in a safe way. +allows accessing the system :data:`errno` error number in a safe way. :mod:`ctypes` maintains a thread-local copy of the systems :data:`errno` variable; if you call foreign functions created with ``use_errno=True`` then the :data:`errno` value before the function call is swapped with the ctypes private @@ -1421,7 +1421,7 @@ loader instance. Class which loads shared libraries. *dlltype* should be one of the :class:`CDLL`, :class:`PyDLL`, :class:`WinDLL`, or :class:`OleDLL` types. - :meth:`__getattr__` has special behavior: It allows to load a shared library by + :meth:`__getattr__` has special behavior: It allows loading a shared library by accessing it as attribute of a library loader instance. The result is cached, so repeated attribute accesses return the same library each time. @@ -1498,7 +1498,7 @@ They are instances of a private class: It is possible to assign a callable Python object that is not a ctypes type, in this case the function is assumed to return a C :c:type:`int`, and - the callable will be called with this integer, allowing to do further + the callable will be called with this integer, allowing further processing or error checking. Using this is deprecated, for more flexible post processing or error checking use a ctypes data type as :attr:`restype` and assign a callable to the :attr:`errcheck` attribute. @@ -1513,7 +1513,7 @@ They are instances of a private class: When a foreign function is called, each actual argument is passed to the :meth:`from_param` class method of the items in the :attr:`argtypes` - tuple, this method allows to adapt the actual argument to an object that + tuple, this method allows adapting the actual argument to an object that the foreign function accepts. For example, a :class:`c_char_p` item in the :attr:`argtypes` tuple will convert a string passed as argument into a bytes object using ctypes conversion rules. @@ -1521,7 +1521,7 @@ They are instances of a private class: New: It is now possible to put items in argtypes which are not ctypes types, but each item must have a :meth:`from_param` method which returns a value usable as argument (integer, string, ctypes instance). This allows - to define adapters that can adapt custom objects as function parameters. + defining adapters that can adapt custom objects as function parameters. .. attribute:: errcheck @@ -1535,12 +1535,12 @@ They are instances of a private class: *result* is what the foreign function returns, as specified by the :attr:`restype` attribute. - *func* is the foreign function object itself, this allows to reuse the + *func* is the foreign function object itself, this allows reusing the same callable object to check or post process the results of several functions. *arguments* is a tuple containing the parameters originally passed to - the function call, this allows to specialize the behavior on the + the function call, this allows specializing the behavior on the arguments used. The object that this function returns will be returned from the @@ -1785,7 +1785,7 @@ Utility functions If a bytes object is specified as first argument, the buffer is made one item larger than its length so that the last element in the array is a NUL termination character. An integer can be passed as second argument which allows - to specify the size of the array if the length of the bytes should not be used. + specifying the size of the array if the length of the bytes should not be used. @@ -1800,21 +1800,21 @@ Utility functions If a string is specified as first argument, the buffer is made one item larger than the length of the string so that the last element in the array is a NUL termination character. An integer can be passed as second argument which - allows to specify the size of the array if the length of the string should not + allows specifying the size of the array if the length of the string should not be used. .. function:: DllCanUnloadNow() - Windows only: This function is a hook which allows to implement in-process + Windows only: This function is a hook which allows implementing in-process COM servers with ctypes. It is called from the DllCanUnloadNow function that the _ctypes extension dll exports. .. function:: DllGetClassObject() - Windows only: This function is a hook which allows to implement in-process + Windows only: This function is a hook which allows implementing in-process COM servers with ctypes. It is called from the DllGetClassObject function that the ``_ctypes`` extension dll exports. @@ -2321,7 +2321,7 @@ other data types containing pointer type fields. checked, only one field can be accessed when names are repeated. It is possible to define the :attr:`_fields_` class variable *after* the - class statement that defines the Structure subclass, this allows to create + class statement that defines the Structure subclass, this allows creating data types that directly or indirectly reference themselves:: class List(Structure): @@ -2342,7 +2342,7 @@ other data types containing pointer type fields. .. attribute:: _pack_ - An optional small integer that allows to override the alignment of + An optional small integer that allows overriding the alignment of structure fields in the instance. :attr:`_pack_` must already be defined when :attr:`_fields_` is assigned, otherwise it will have no effect. @@ -2354,8 +2354,8 @@ other data types containing pointer type fields. assigned, otherwise it will have no effect. The fields listed in this variable must be structure or union type fields. - :mod:`ctypes` will create descriptors in the structure type that allows to - access the nested fields directly, without the need to create the + :mod:`ctypes` will create descriptors in the structure type that allows + accessing the nested fields directly, without the need to create the structure or union field. Here is an example type (Windows):: diff --git a/Doc/library/nis.rst b/Doc/library/nis.rst index ade2a7a..9e2b572 100644 --- a/Doc/library/nis.rst +++ b/Doc/library/nis.rst @@ -26,7 +26,7 @@ The :mod:`nis` module defines the following functions: Note that *mapname* is first checked if it is an alias to another name. - The *domain* argument allows to override the NIS domain used for the lookup. If + The *domain* argument allows overriding the NIS domain used for the lookup. If unspecified, lookup is in the default NIS domain. @@ -38,7 +38,7 @@ The :mod:`nis` module defines the following functions: Note that *mapname* is first checked if it is an alias to another name. - The *domain* argument allows to override the NIS domain used for the lookup. If + The *domain* argument allows overriding the NIS domain used for the lookup. If unspecified, lookup is in the default NIS domain. @@ -46,7 +46,7 @@ The :mod:`nis` module defines the following functions: Return a list of all valid maps. - The *domain* argument allows to override the NIS domain used for the lookup. If + The *domain* argument allows overriding the NIS domain used for the lookup. If unspecified, lookup is in the default NIS domain. diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst index 8f814df..e3efc8b 100644 --- a/Doc/library/signal.rst +++ b/Doc/library/signal.rst @@ -11,7 +11,7 @@ This module provides mechanisms to use signal handlers in Python. General rules ------------- -The :func:`signal.signal` function allows to define custom handlers to be +The :func:`signal.signal` function allows defining custom handlers to be executed when a signal is received. A small number of default handlers are installed: :const:`SIGPIPE` is ignored (so write errors on pipes and sockets can be reported as ordinary Python exceptions) and :const:`SIGINT` is diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst index 8cbd20d..2234d51 100644 --- a/Doc/library/smtplib.rst +++ b/Doc/library/smtplib.rst @@ -33,7 +33,7 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions). *timeout* parameter specifies a timeout in seconds for blocking operations like the connection attempt (if not specified, the global default timeout setting will be used). If the timeout expires, :exc:`socket.timeout` is - raised. The optional source_address parameter allows to bind + raised. The optional source_address parameter allows binding to some specific source address in a machine with multiple network interfaces, and/or to some specific source TCP port. It takes a 2-tuple (host, port), for the socket to bind to as its source address before @@ -76,7 +76,7 @@ Protocol) and :rfc:`1869` (SMTP Service Extensions). *port* is zero, the standard SMTP-over-SSL port (465) is used. The optional arguments *local_hostname*, *timeout* and *source_address* have the same meaning as they do in the :class:`SMTP` class. *context*, also optional, - can contain a :class:`~ssl.SSLContext` and allows to configure various + can contain a :class:`~ssl.SSLContext` and allows configuring various aspects of the secure connection. Please read :ref:`ssl-security` for best practices. diff --git a/Doc/library/tarfile.rst b/Doc/library/tarfile.rst index adacb0a..e418d5b 100644 --- a/Doc/library/tarfile.rst +++ b/Doc/library/tarfile.rst @@ -111,7 +111,7 @@ Some facts and figures: specifies the blocksize and defaults to ``20 * 512`` bytes. Use this variant in combination with e.g. ``sys.stdin``, a socket :term:`file object` or a tape device. However, such a :class:`TarFile` object is limited in that it does - not allow to be accessed randomly, see :ref:`tar-examples`. The currently + not allow random access, see :ref:`tar-examples`. The currently possible modes: +-------------+--------------------------------------------+ diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index af86055..7ec9dce 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -398,7 +398,7 @@ Miscellaneous options tracing with a traceback limit of *NFRAME* frames. See the :func:`tracemalloc.start` for more information. - It also allows to pass arbitrary values and retrieve them through the + It also allows passing arbitrary values and retrieving them through the :data:`sys._xoptions` dictionary. .. versionchanged:: 3.2 diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst index 094eff8..6ee40cd 100644 --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -1528,7 +1528,7 @@ by Petri Lehtinen in :issue:`12021`.) multiprocessing --------------- -The new :func:`multiprocessing.connection.wait` function allows to poll +The new :func:`multiprocessing.connection.wait` function allows polling multiple objects (such as connections, sockets and pipes) with a timeout. (Contributed by Richard Oudkerk in :issue:`12328`.) @@ -1715,8 +1715,8 @@ pickle ------ :class:`pickle.Pickler` objects now have an optional -:attr:`~pickle.Pickler.dispatch_table` attribute allowing to set per-pickler -reduction functions. +:attr:`~pickle.Pickler.dispatch_table` attribute allowing per-pickler +reduction functions to be set. (Contributed by Richard Oudkerk in :issue:`14166`.) diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index bb520dc..52a6e91 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -748,7 +748,7 @@ Improved Modules argparse -------- -The :class:`~argparse.ArgumentParser` class now allows to disable +The :class:`~argparse.ArgumentParser` class now allows disabling :ref:`abbreviated usage ` of long options by setting :ref:`allow_abbrev` to ``False``. (Contributed by Jonathan Paugh, Steven Bethard, paul j3 and Daniel Eriksson in :issue:`14910`.) @@ -913,12 +913,12 @@ external `PyPI package `_. compileall ---------- -A new :mod:`compileall` option, :samp:`-j {N}`, allows to run *N* workers +A new :mod:`compileall` option, :samp:`-j {N}`, allows running *N* workers simultaneously to perform parallel bytecode compilation. The :func:`~compileall.compile_dir` function has a corresponding ``workers`` parameter. (Contributed by Claudiu Popa in :issue:`16104`.) -Another new option, ``-r``, allows to control the maximum recursion +Another new option, ``-r``, allows controlling the maximum recursion level for subdirectories. (Contributed by Claudiu Popa in :issue:`19628`.) The ``-q`` command line option can now be specified more than once, in @@ -1453,8 +1453,8 @@ or newer, and ``getentropy()`` on OpenBSD 5.6 and newer, removing the need to use ``/dev/urandom`` and avoiding failures due to potential file descriptor exhaustion. (Contributed by Victor Stinner in :issue:`22181`.) -New :func:`~os.get_blocking` and :func:`~os.set_blocking` functions allow to -get and set a file descriptor's blocking mode (:data:`~os.O_NONBLOCK`.) +New :func:`~os.get_blocking` and :func:`~os.set_blocking` functions allow +getting and setting a file descriptor's blocking mode (:data:`~os.O_NONBLOCK`.) (Contributed by Victor Stinner in :issue:`22054`.) The :func:`~os.truncate` and :func:`~os.ftruncate` functions are now supported @@ -1681,8 +1681,8 @@ socket Functions with timeouts now use a monotonic clock, instead of a system clock. (Contributed by Victor Stinner in :issue:`22043`.) -A new :meth:`socket.sendfile() ` method allows to -send a file over a socket by using the high-performance :func:`os.sendfile` +A new :meth:`socket.sendfile() ` method allows +sending a file over a socket by using the high-performance :func:`os.sendfile` function on UNIX, resulting in uploads being from 2 to 3 times faster than when using plain :meth:`socket.send() `. (Contributed by Giampaolo Rodola' in :issue:`17552`.) diff --git a/Include/object.h b/Include/object.h index eac9541..0e67a4e 100644 --- a/Include/object.h +++ b/Include/object.h @@ -134,7 +134,7 @@ typedef struct { usage, the string "foo" is interned, and the structures are linked. On interpreter shutdown, all strings are released (through _PyUnicode_ClearStaticStrings). - Alternatively, _Py_static_string allows to choose the variable name. + Alternatively, _Py_static_string allows choosing the variable name. _PyUnicode_FromId returns a borrowed reference to the interned string. _PyObject_{Get,Set,Has}AttrId are __getattr__ versions using _Py_Identifier*. */ diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py index 4dcb654..281fea3 100644 --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -142,7 +142,7 @@ class Future: def __init__(self, *, loop=None): """Initialize the future. - The optional event_loop argument allows to explicitly set the event + The optional event_loop argument allows explicitly setting the event loop object used by the future. If it's not provided, the future uses the default event loop. """ diff --git a/Lib/ctypes/__init__.py b/Lib/ctypes/__init__.py index dc7458a..0d86078 100644 --- a/Lib/ctypes/__init__.py +++ b/Lib/ctypes/__init__.py @@ -368,8 +368,8 @@ class CDLL(object): return func class PyDLL(CDLL): - """This class represents the Python library itself. It allows to - access Python API functions. The GIL is not released, and + """This class represents the Python library itself. It allows + accessing Python API functions. The GIL is not released, and Python exceptions are handled correctly. """ _func_flags_ = _FUNCFLAG_CDECL | _FUNCFLAG_PYTHONAPI diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py index afac62a..b2be9b1 100644 --- a/Lib/test/test_cmd_line_script.py +++ b/Lib/test/test_cmd_line_script.py @@ -499,7 +499,7 @@ class CmdLineTest(unittest.TestCase): def test_non_ascii(self): # Mac OS X denies the creation of a file with an invalid UTF-8 name. - # Windows allows to create a name with an arbitrary bytes name, but + # Windows allows creating a name with an arbitrary bytes name, but # Python cannot a undecodable bytes argument to a subprocess. if (support.TESTFN_UNDECODABLE and sys.platform not in ('win32', 'darwin')): diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 379e316..6a7ba0b 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -2775,7 +2775,7 @@ Now we'll write a couple files, one with three tests, the other a python module with two tests, both of the files having "errors" in the tests that can be made non-errors by applying the appropriate doctest options to the run (ELLIPSIS in the first file, NORMALIZE_WHITESPACE in the second). This combination will -allow to thoroughly test the -f and -o flags, as well as the doctest command's +allow thoroughly testing the -f and -o flags, as well as the doctest command's ability to process more than one file on the command line and, since the second file ends in '.py', its handling of python module files (as opposed to straight text files). diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py index 6ba55df..86fc2de 100644 --- a/Lib/test/test_genericpath.py +++ b/Lib/test/test_genericpath.py @@ -419,7 +419,7 @@ class CommonTest(GenericTest): def test_nonascii_abspath(self): if (support.TESTFN_UNDECODABLE # Mac OS X denies the creation of a directory with an invalid - # UTF-8 name. Windows allows to create a directory with an + # UTF-8 name. Windows allows creating a directory with an # arbitrary bytes name, but fails to enter this directory # (when the bytes name is used). and sys.platform not in ('win32', 'darwin')): diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py index 1bf1748..0319d5d 100644 --- a/Lib/test/test_strptime.py +++ b/Lib/test/test_strptime.py @@ -190,7 +190,7 @@ class TimeRETests(unittest.TestCase): def test_whitespace_substitution(self): # When pattern contains whitespace, make sure it is taken into account - # so as to not allow to subpatterns to end up next to each other and + # so as to not allow subpatterns to end up next to each other and # "steal" characters from each other. pattern = self.time_re.pattern('%j %H') self.assertFalse(re.match(pattern, "180")) diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 12085a9..4e642c6 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -2500,7 +2500,7 @@ class Checkbutton(Widget): self.tk.call(self._w, 'toggle') class Entry(Widget, XView): - """Entry widget which allows to display simple text.""" + """Entry widget which allows displaying simple text.""" def __init__(self, master=None, cnf={}, **kw): """Construct an entry widget with the parent MASTER. @@ -2696,7 +2696,7 @@ class Listbox(Widget, XView, YView): itemconfig = itemconfigure class Menu(Widget): - """Menu widget which allows to display menu bars, pull-down menus and pop-up menus.""" + """Menu widget which allows displaying menu bars, pull-down menus and pop-up menus.""" def __init__(self, master=None, cnf={}, **kw): """Construct menu widget with the parent MASTER. diff --git a/Misc/HISTORY b/Misc/HISTORY index 5e5bc60..f964f5f 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -1095,7 +1095,7 @@ Library functions to support PEP 3115 compliant dynamic class creation. Patch by Daniel Urban and Nick Coghlan. -- Issue #13152: Allow to specify a custom tabsize for expanding tabs in +- Issue #13152: Allow specifying a custom tabsize for expanding tabs in textwrap. Patch by John Feuerstein. - Issue #14721: Send the correct 'Content-length: 0' header when the body is an @@ -2234,7 +2234,7 @@ Library fixed. - Issue #14166: Pickler objects now have an optional ``dispatch_table`` - attribute which allows to set custom per-pickler reduction functions. + attribute which allows setting custom per-pickler reduction functions. Patch by sbt. - Issue #14177: marshal.loads() now raises TypeError when given an unicode @@ -3185,7 +3185,7 @@ Library binary mode, but ensure that the shebang is decodable from UTF-8 and from the encoding of the script. -- Issue #8498: In socket.accept(), allow to specify 0 as a backlog value in +- Issue #8498: In socket.accept(), allow specifying 0 as a backlog value in order to accept exactly one connection. Patch by Daniel Evers. - Issue #12011: signal.signal() and signal.siginterrupt() raise an OSError, @@ -3885,7 +3885,7 @@ Tests - Issue #12331: The test suite for lib2to3 can now run from an installed Python. -- Issue #12626: In regrtest, allow to filter tests using a glob filter +- Issue #12626: In regrtest, allow filtering tests using a glob filter with the ``-m`` (or ``--match``) option. This works with all test cases using the unittest module. This is useful with long test suites such as test_io or test_subprocess. @@ -4221,7 +4221,7 @@ What's New in Python 3.2 Release Candidate 2? Core and Builtins ----------------- -- Issue #10451: memoryview objects could allow to mutate a readable buffer. +- Issue #10451: memoryview objects could allow mutating a readable buffer. Initial patch by Ross Lagerwall. Library @@ -4765,7 +4765,7 @@ Library - Add the "display" and "undisplay" pdb commands. -- Issue #7245: Add a SIGINT handler in pdb that allows to break a program again +- Issue #7245: Add a SIGINT handler in pdb that allows breaking a program again after a "continue" command. - Add the "interact" pdb command. @@ -6916,7 +6916,7 @@ Library correct encoding. - Issue #4870: Add an `options` attribute to SSL contexts, as well as several - ``OP_*`` constants to the `ssl` module. This allows to selectively disable + ``OP_*`` constants to the `ssl` module. This allows selectively disabling protocol versions, when used in combination with `PROTOCOL_SSLv23`. - Issue #8759: Fixed user paths in sysconfig for posix and os2 schemes. @@ -9497,8 +9497,8 @@ Extension Modules - Issue #4051: Prevent conflict of UNICODE macros in cPickle. -- Issue #4738: Each zlib object now has a separate lock, allowing to compress - or decompress several streams at once on multi-CPU systems. Also, the GIL +- Issue #4738: Each zlib object now has a separate lock, allowing several streams + to be compressed or decompressed at once on multi-CPU systems. Also, the GIL is now released when computing the CRC of a large buffer. Patch by ebfe. - Issue #4228: Pack negative values the same way as 2.4 in struct's L format. @@ -9996,7 +9996,7 @@ Core and Builtins as bytes string, please use PyUnicode_AsUTF8String() instead. - Issue #3460: PyUnicode_Join() implementation is 10% to 80% faster thanks - to Python 3.0's stricter semantics which allow to avoid successive + to Python 3.0's stricter semantics which allow avoiding successive reallocations of the result string (this also affects str.join()). @@ -12762,7 +12762,7 @@ Library - Patch #1110248: SYNC_FLUSH the zlib buffer for GZipFile.flush. -- Patch #1107973: Allow to iterate over the lines of a tarfile.ExFileObject. +- Patch #1107973: Allow iterating over the lines of a tarfile.ExFileObject. - Patch #1104111: Alter setup.py --help and --help-commands. @@ -13739,7 +13739,7 @@ Library same as when the argument is omitted). [SF bug 658254, patch 663482] -- nntplib does now allow to ignore a .netrc file. +- nntplib does now allow ignoring a .netrc file. - urllib2 now recognizes Basic authentication even if other authentication schemes are offered. @@ -14157,7 +14157,7 @@ Extension modules - fcntl.ioctl now warns if the mutate flag is not specified. -- nt now properly allows to refer to UNC roots, e.g. in nt.stat(). +- nt now properly allows referring to UNC roots, e.g. in nt.stat(). - the weakref module now supports additional objects: array.array, sre.pattern_objects, file objects, and sockets. @@ -16715,7 +16715,7 @@ C API - New functions PyErr_SetExcFromWindowsErr() and PyErr_SetExcFromWindowsErrWithFilename(). Similar to PyErr_SetFromWindowsErrWithFilename() and - PyErr_SetFromWindowsErr(), but they allow to specify + PyErr_SetFromWindowsErr(), but they allow specifying the exception type to raise. Available on Windows. - Py_FatalError() is now declared as taking a const char* argument. It @@ -17590,8 +17590,8 @@ Type/class unification and new-style classes - property() now takes 4 keyword arguments: fget, fset, fdel and doc. These map to read-only attributes 'fget', 'fset', 'fdel', and '__doc__' in the constructed property object. fget, fset and fdel weren't - discoverable from Python in 2.2a3. __doc__ is new, and allows to - associate a docstring with a property. + discoverable from Python in 2.2a3. __doc__ is new, and allows + associating a docstring with a property. - Comparison overloading is now more completely implemented. For example, a str subclass instance can properly be compared to a str @@ -18006,7 +18006,7 @@ Tests ----- - regrtest.py now knows which tests are expected to be skipped on some - platforms, allowing to give clearer test result output. regrtest + platforms, allowing clearer test result output to be given. regrtest also has optional --use/-u switch to run normally disabled tests which require network access or consume significant disk resources. diff --git a/Misc/NEWS b/Misc/NEWS index 1d24f50..4c1e758 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1729,8 +1729,8 @@ Library and ASCII letter now raise a deprecation warning and will be forbidden in Python 3.6. -- Issue #23671: string.Template now allows to specify the "self" parameter as - keyword argument. string.Formatter now allows to specify the "self" and +- Issue #23671: string.Template now allows specifying the "self" parameter as + a keyword argument. string.Formatter now allows specifying the "self" and the "format_string" parameters as keyword arguments. - Issue #23502: The pprint module now supports mapping proxies. @@ -2859,7 +2859,7 @@ Library - Issue #22085: Dropped support of Tk 8.3 in Tkinter. - Issue #21580: Now Tkinter correctly handles bytes arguments passed to Tk. - In particular this allows to initialize images from binary data. + In particular this allows initializing images from binary data. - Issue #22003: When initialized from a bytes object, io.BytesIO() now defers making a copy until it is mutated, improving performance and @@ -3004,7 +3004,7 @@ Library - Issue #21711: support for "site-python" directories has now been removed from the site module (it was deprecated in 3.4). -- Issue #17552: new socket.sendfile() method allowing to send a file over a +- Issue #17552: new socket.sendfile() method allowing a file to be sent over a socket by using high-performance os.sendfile() on UNIX. Patch by Giampaolo Rodola'. @@ -6967,7 +6967,7 @@ Library symlinks on POSIX platforms. - Issue #13773: sqlite3.connect() gets a new `uri` parameter to pass the - filename as a URI, allowing to pass custom options. + filename as a URI, allowing custom options to be passed. - Issue #16564: Fixed regression relative to Python2 in the operation of email.encoders.encode_noop when used with binary data. @@ -7228,7 +7228,7 @@ Library - Issue #7719: Make distutils ignore ``.nfs*`` files instead of choking later on. Initial patch by SilentGhost and Jeff Ramnani. -- Issue #13120: Allow to call pdb.set_trace() from thread. +- Issue #13120: Allow calling pdb.set_trace() from thread. Patch by Ilya Sandler. - Issue #16585: Make CJK encoders support error handlers that return bytes per diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 5cf2b8b..ff1827c 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3402,7 +3402,7 @@ PyCFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds) return NULL; } - /* XXX XXX This would allow to pass additional options. For COM + /* XXX XXX This would allow passing additional options. For COM method *implementations*, we would probably want different behaviour than in 'normal' callback functions: return a HRESULT if an exception occurs in the callback, and print the traceback not diff --git a/Modules/_ctypes/libffi/m4/libtool.m4 b/Modules/_ctypes/libffi/m4/libtool.m4 index 4bc6b22..d9cc77b 100644 --- a/Modules/_ctypes/libffi/m4/libtool.m4 +++ b/Modules/_ctypes/libffi/m4/libtool.m4 @@ -1121,7 +1121,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], # If we don't find anything, use the default library path according # to the aix ld manual. # Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. +# Allow overriding them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl if test set = "${lt_cv_aix_libpath+set}"; then -- cgit v0.12