cpython: 4cfc19f667aa (original) (raw)

Mercurial > cpython

changeset 100213:4cfc19f667aa 2.7

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. [#26304]

line wrap: on

line diff

--- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -24,7 +24,7 @@ the format unit; the entry in (round) pa that matches the format unit; and the entry in [square] brackets is the type of the C variable(s) whose address should be passed. -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.

--- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -243,8 +243,8 @@ bothered to add the b mode when open 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).

--- a/Doc/library/ctypes.rst +++ b/Doc/library/ctypes.rst @@ -934,7 +934,7 @@ other, and finally follow the pointer ch 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 @@ -1404,7 +1404,7 @@ details, consult the :manpage:dlopen(3)[](#l3.12) ignored.[](#l3.13) [](#l3.14) The *use_errno* parameter, when set to True, enables a ctypes mechanism that[](#l3.15) -allows to access the system :data:errno error number in a safe way.[](#l3.16) +allows accessing the system :data:errno error number in a safe way.[](#l3.17) :mod:ctypes maintains a thread-local copy of the systems :data:errno[](#l3.18) variable; if you call foreign functions created with ``use_errno=True`` then the[](#l3.19) :data:errno value before the function call is swapped with the ctypes private[](#l3.20) @@ -1478,7 +1478,7 @@ loader instance.[](#l3.21) Class which loads shared libraries. *dlltype* should be one of the[](#l3.22) :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.

@@ -1557,7 +1557,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[](#l3.34)

•  the callable will be called with this integer, allowing further[](#l3.35)
   processing or error checking.  Using this is deprecated, for more flexible[](#l3.36)
   post processing or error checking use a ctypes data type as[](#l3.37)
   :attr:`restype` and assign a callable to the :attr:`errcheck` attribute.[](#l3.38)

@@ -1573,7 +1573,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[](#l3.43)

•  tuple, this method allows adapting the actual argument to an object that[](#l3.44)
   the foreign function accepts.  For example, a :class:`c_char_p` item in[](#l3.45)
   the :attr:`argtypes` tuple will convert a unicode string passed as[](#l3.46)
   argument into an byte string using ctypes conversion rules.[](#l3.47)

@@ -1581,7 +1581,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.[](#l3.52)

•  defining adapters that can adapt custom objects as function parameters.[](#l3.53)

.. attribute:: errcheck @@ -1595,12 +1595,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[](#l3.61)

•     *func* is the foreign function object itself, this allows reusing the[](#l3.62)
      same callable object to check or post process the results of several[](#l3.63)
      functions.[](#l3.64)

arguments is a tuple containing the parameters originally passed to

•     the function call, this allows to specialize the behavior on the[](#l3.67)

•     the function call, this allows specializing the behavior on the[](#l3.68)
      arguments used.[](#l3.69)

The object that this function returns will be returned from the @@ -1853,7 +1853,7 @@ 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 be used.

• specifying the size of the array if the length of the string should not be used. If the first parameter is a unicode string, it is converted into an 8-bit string according to ctypes conversion rules. @@ -1870,7 +1870,7 @@ Utility functions If a unicode 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. If the first parameter is a 8-bit string, it is converted into an unicode string @@ -1879,14 +1879,14 @@ Utility functions

.. 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.

@@ -2432,7 +2432,7 @@ other data types containing pointer type 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[](#l3.111)

•  class statement that defines the Structure subclass, this allows creating[](#l3.112)
   data types that directly or indirectly reference themselves::[](#l3.113)

class List(Structure): @@ -2453,7 +2453,7 @@ other data types containing pointer type .. attribute:: pack

•  An optional small integer that allows to override the alignment of[](#l3.120)

•  An optional small integer that allows overriding the alignment of[](#l3.121)
   structure fields in the instance.  :attr:`_pack_` must already be defined[](#l3.122)
   when :attr:`_fields_` is assigned, otherwise it will have no effect.[](#l3.123)

@@ -2465,8 +2465,8 @@ other data types containing pointer type 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[](#l3.129)

•  access the nested fields directly, without the need to create the[](#l3.130)

•  :mod:`ctypes` will create descriptors in the structure type that allow[](#l3.131)

•  accessing the nested fields directly, without the need to create the[](#l3.132)
   structure or union field.[](#l3.133)

Here is an example type (Windows)::

--- a/Doc/library/nis.rst +++ b/Doc/library/nis.rst @@ -27,7 +27,7 @@ The :mod:nis module defines the follow Note that mapname is first checked if it is an alias to another name. .. versionchanged:: 2.5

•  The *domain* argument allows to override the NIS domain used for the lookup. If[](#l4.7)

•  The *domain* argument allows overriding the NIS domain used for the lookup. If[](#l4.8)
   unspecified, lookup is in the default NIS domain.[](#l4.9)

@@ -40,7 +40,7 @@ The :mod:nis module defines the follow Note that mapname is first checked if it is an alias to another name. .. versionchanged:: 2.5

•  The *domain* argument allows to override the NIS domain used for the lookup. If[](#l4.16)

•  The *domain* argument allows overriding the NIS domain used for the lookup. If[](#l4.17)
   unspecified, lookup is in the default NIS domain.[](#l4.18)

@@ -49,7 +49,7 @@ The :mod:nis module defines the follow Return a list of all valid maps. .. versionchanged:: 2.5

•  The *domain* argument allows to override the NIS domain used for the lookup. If[](#l4.25)

•  The *domain* argument allows overriding the NIS domain used for the lookup. If[](#l4.26)
   unspecified, lookup is in the default NIS domain.[](#l4.27)

--- a/Doc/library/tarfile.rst +++ b/Doc/library/tarfile.rst @@ -90,7 +90,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 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: +-------------+--------------------------------------------+

--- a/Lib/ctypes/init.py +++ b/Lib/ctypes/init.py @@ -386,8 +386,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

--- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -2486,7 +2486,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.

@@ -2682,7 +2682,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.

--- 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[](#l8.7)

•    # so as to not allow subpatterns to end up next to each other and[](#l8.8)
     # "steal" characters from each other.[](#l8.9)
     pattern = self.time_re.pattern('%j %H')[](#l8.10)
     self.assertFalse(re.match(pattern, "180"))[](#l8.11)

--- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -1845,7 +1845,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. @@ -2822,7 +2822,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. @@ -3240,7 +3240,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. @@ -5798,7 +5798,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 @@ -6678,8 +6678,8 @@ Type/class unification and new-style cla
• 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 @@ -7094,7 +7094,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.

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -623,8 +623,8 @@ Library

• Issue #21802: The reader in BufferedRWPair now is closed even when closing writer failed in BufferedRWPair.close(). -- 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 #21560: An attempt to write a data of wrong type no longer cause

--- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3497,7 +3497,7 @@ PyCFuncPtr_new(PyTypeObject *type, PyObj 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

--- 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