Merge doc and comment fixes from 3.5 · AmitKumar79/PythonBegin@abe4d52 · GitHub
Skip to content

Commit abe4d52

Browse files
vadmiumvadmium
committed
Merge doc and comment fixes from 3.5
2 parents f8d6f73 + 8f26565 commit abe4d52

11 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎Doc/library/tempfile.rst‎

Lines changed: 1 addition & 1 deletion

‎Doc/library/test.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ The :mod:`test.support` module defines the following functions:
550550
or passed to an external program (i.e. the ``-accept`` argument to
551551
openssl's s_server mode). Always prefer :func:`bind_port` over
552552
:func:`find_unused_port` where possible. Using a hard coded port is
553-
discouraged since it can makes multiple instances of the test impossible to
553+
discouraged since it can make multiple instances of the test impossible to
554554
run simultaneously, which is a problem for buildbots.
555555

556556

‎Doc/whatsnew/2.2.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,7 @@ Here are the changes 2.2 introduces:
758758
operators.
759759

760760
* Python 2.2 supports some command-line arguments for testing whether code will
761-
works with the changed division semantics. Running python with :option:`-Q
761+
work with the changed division semantics. Running python with :option:`-Q
762762
warn` will cause a warning to be issued whenever division is applied to two
763763
integers. You can use this to find code that's affected by the change and fix
764764
it. By default, Python 2.2 will simply perform classic division without a

‎Lib/gzip.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def __init__(self, filename=None, mode=None,
133133
a file object.
134134
135135
When fileobj is not None, the filename argument is only used to be
136-
included in the gzip file header, which may includes the original
136+
included in the gzip file header, which may include the original
137137
filename of the uncompressed file. It defaults to the filename of
138138
fileobj, if discernible; otherwise, it defaults to the empty string,
139139
and in this case the original filename is not included in the header.

‎Lib/optparse.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ class OptionContainer:
901901
_short_opt : { string : Option }
902902
dictionary mapping short option strings, eg. "-f" or "-X",
903903
to the Option instances that implement them. If an Option
904-
has multiple short option strings, it will appears in this
904+
has multiple short option strings, it will appear in this
905905
dictionary multiple times. [1]
906906
_long_opt : { string : Option }
907907
dictionary mapping long option strings, eg. "--file" or

‎Lib/test/test_tracemalloc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ def test_snapshot_save_attr(self):
261261
snapshot.dump(support.TESTFN)
262262
self.addCleanup(support.unlink, support.TESTFN)
263263

264-
# load() should recreates the attribute
264+
# load() should recreate the attribute
265265
snapshot2 = tracemalloc.Snapshot.load(support.TESTFN)
266266
self.assertEqual(snapshot2.test_attr, "new")
267267

‎Misc/HISTORY‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23743,7 +23743,7 @@ the first class with an applicable hook wins. Makes more sense.
2374323743
- Changed the checks made in Py_Initialize() and Py_Finalize(). It is
2374423744
now legal to call these more than once. The first call to
2374523745
Py_Initialize() initializes, the first call to Py_Finalize()
23746-
finalizes. There's also a new API, Py_IsInitalized() which checks
23746+
finalizes. There's also a new API, Py_IsInitialized() which checks
2374723747
whether we are already initialized (in case you want to leave things
2374823748
as they were).
2374923749

‎Misc/NEWS‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5851,8 +5851,8 @@ Library
58515851
- Issue #19448: Add private API to SSL module to lookup ASN.1 objects by OID,
58525852
NID, short name and long name.
58535853

5854-
- Issue #19282: dbm.open now supports the context management protocol. (Inital
5855-
patch by Claudiu Popa)
5854+
- Issue #19282: dbm.open now supports the context management protocol.
5855+
(Initial patch by Claudiu Popa)
58565856

58575857
- Issue #8311: Added support for writing any bytes-like objects in the aifc,
58585858
sunau, and wave modules.
@@ -5946,7 +5946,7 @@ Library
59465946
- Issue #19227: Remove pthread_atfork() handler. The handler was added to
59475947
solve #18747 but has caused issues.
59485948

5949-
- Issue #19420: Fix reference leak in module initalization code of
5949+
- Issue #19420: Fix reference leak in module initialization code of
59505950
_hashopenssl.c
59515951

59525952
- Issue #19329: Optimized compiling charsets in regular expressions.

‎Modules/_io/stringio.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,8 +913,8 @@ stringio_setstate(stringio *self, PyObject *state)
913913
Py_DECREF(initarg);
914914

915915
/* Restore the buffer state. Even if __init__ did initialize the buffer,
916-
we have to initialize it again since __init__ may translates the
917-
newlines in the inital_value string. We clearly do not want that
916+
we have to initialize it again since __init__ may translate the
917+
newlines in the initial_value string. We clearly do not want that
918918
because the string value in the state tuple has already been translated
919919
once by __init__. So we do not take any chance and replace object's
920920
buffer completely. */

‎Objects/typeobject.c‎

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)