Skip to content

Commit 2eb819f

Browse files
vadmiumvadmium
committed
Issue python#25523: Merge "a" to "an" fixes from 3.4 into 3.5
2 parents 56275dc + 7462b64 commit 2eb819f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+136
-136
lines changed

‎Doc/c-api/buffer.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protocol <bufferobjects>`. This protocol has two sides:
4040

4141
Simple objects such as :class:`bytes` and :class:`bytearray` expose their
4242
underlying buffer in byte-oriented form. Other forms are possible; for example,
43-
the elements exposed by a :class:`array.array` can be multi-byte values.
43+
the elements exposed by an :class:`array.array` can be multi-byte values.
4444

4545
An example consumer of the buffer interface is the :meth:`~io.BufferedIOBase.write`
4646
method of file objects: any object that can export a series of bytes through

‎Doc/faq/programming.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ How do I modify a string in place?
849849
You can't, because strings are immutable. In most situations, you should
850850
simply construct a new string from the various parts you want to assemble
851851
it from. However, if you need an object with the ability to modify in-place
852-
unicode data, try using a :class:`io.StringIO` object or the :mod:`array`
852+
unicode data, try using an :class:`io.StringIO` object or the :mod:`array`
853853
module::
854854

855855
>>> import io

‎Doc/library/chunk.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Usually an IFF-type file consists of one or more chunks. The proposed usage of
4747
the :class:`Chunk` class defined here is to instantiate an instance at the start
4848
of each chunk and read from the instance until it reaches the end, after which a
4949
new instance can be instantiated. At the end of the file, creating a new
50-
instance will fail with a :exc:`EOFError` exception.
50+
instance will fail with an :exc:`EOFError` exception.
5151

5252

5353
.. class:: Chunk(file, align=True, bigendian=True, inclheader=False)

‎Doc/library/concurrent.futures.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Executor Objects
9090
ThreadPoolExecutor
9191
------------------
9292

93-
:class:`ThreadPoolExecutor` is a :class:`Executor` subclass that uses a pool of
93+
:class:`ThreadPoolExecutor` is an :class:`Executor` subclass that uses a pool of
9494
threads to execute calls asynchronously.
9595

9696
Deadlocks can occur when the callable associated with a :class:`Future` waits on
@@ -304,7 +304,7 @@ The :class:`Future` class encapsulates the asynchronous execution of a callable.
304304

305305
Added callables are called in the order that they were added and are
306306
always called in a thread belonging to the process that added them. If
307-
the callable raises a :exc:`Exception` subclass, it will be logged and
307+
the callable raises an :exc:`Exception` subclass, it will be logged and
308308
ignored. If the callable raises a :exc:`BaseException` subclass, the
309309
behavior is undefined.
310310

‎Doc/library/ctypes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ loads libraries which export functions using the standard ``cdecl`` calling
3939
convention, while *windll* libraries call functions using the ``stdcall``
4040
calling convention. *oledll* also uses the ``stdcall`` calling convention, and
4141
assumes the functions return a Windows :c:type:`HRESULT` error code. The error
42-
code is used to automatically raise a :class:`OSError` exception when the
42+
code is used to automatically raise an :class:`OSError` exception when the
4343
function call fails.
4444

4545
.. versionchanged:: 3.3

‎Doc/library/difflib.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ diffs. For comparing directories and files, see also, the :mod:`filecmp` module.
278278
generating the delta lines) in unified diff format.
279279

280280
Unified diffs are a compact way of showing just the lines that have changed plus
281-
a few lines of context. The changes are shown in a inline style (instead of
281+
a few lines of context. The changes are shown in an inline style (instead of
282282
separate before/after blocks). The number of context lines is set by *n* which
283283
defaults to three.
284284

‎Doc/library/fcntl.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ interface to the :c:func:`fcntl` and :c:func:`ioctl` Unix routines.
1616

1717
All functions in this module take a file descriptor *fd* as their first
1818
argument. This can be an integer file descriptor, such as returned by
19-
``sys.stdin.fileno()``, or a :class:`io.IOBase` object, such as ``sys.stdin``
19+
``sys.stdin.fileno()``, or an :class:`io.IOBase` object, such as ``sys.stdin``
2020
itself, which provides a :meth:`~io.IOBase.fileno` that returns a genuine file
2121
descriptor.
2222

2323
.. versionchanged:: 3.3
24-
Operations in this module used to raise a :exc:`IOError` where they now
25-
raise a :exc:`OSError`.
24+
Operations in this module used to raise an :exc:`IOError` where they now
25+
raise an :exc:`OSError`.
2626

2727

2828
The module defines the following functions:

‎Doc/library/ftplib.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,9 @@ followed by ``lines`` for the text version or ``binary`` for the binary version.
287287

288288
.. method:: FTP.transfercmd(cmd, rest=None)
289289

290-
Initiate a transfer over the data connection. If the transfer is active, send a
290+
Initiate a transfer over the data connection. If the transfer is active, send an
291291
``EPRT`` or ``PORT`` command and the transfer command specified by *cmd*, and
292-
accept the connection. If the server is passive, send a ``EPSV`` or ``PASV``
292+
accept the connection. If the server is passive, send an ``EPSV`` or ``PASV``
293293
command, connect to it, and start the transfer command. Either way, return the
294294
socket for the connection.
295295

‎Doc/library/functions.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1032,9 +1032,9 @@ are always available. They are listed here in alphabetical order.
10321032
:class:`io.TextIOBase` (specifically :class:`io.TextIOWrapper`). When used
10331033
to open a file in a binary mode with buffering, the returned class is a
10341034
subclass of :class:`io.BufferedIOBase`. The exact class varies: in read
1035-
binary mode, it returns a :class:`io.BufferedReader`; in write binary and
1036-
append binary modes, it returns a :class:`io.BufferedWriter`, and in
1037-
read/write mode, it returns a :class:`io.BufferedRandom`. When buffering is
1035+
binary mode, it returns an :class:`io.BufferedReader`; in write binary and
1036+
append binary modes, it returns an :class:`io.BufferedWriter`, and in
1037+
read/write mode, it returns an :class:`io.BufferedRandom`. When buffering is
10381038
disabled, the raw stream, a subclass of :class:`io.RawIOBase`,
10391039
:class:`io.FileIO`, is returned.
10401040

‎Doc/library/gzip.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ The module defines the following items:
9696

9797
Calling a :class:`GzipFile` object's :meth:`close` method does not close
9898
*fileobj*, since you might wish to append more material after the compressed
99-
data. This also allows you to pass a :class:`io.BytesIO` object opened for
99+
data. This also allows you to pass an :class:`io.BytesIO` object opened for
100100
writing as *fileobj*, and retrieve the resulting memory buffer using the
101101
:class:`io.BytesIO` object's :meth:`~io.BytesIO.getvalue` method.
102102

0 commit comments

Comments
 (0)