diff options
author | Martin Panter <vadmium+py@gmail.com> | 2016-04-19 23:23:16 (GMT) |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2016-04-19 23:23:16 (GMT) |
commit | abe4d52a1a175b784a5ccae6f31638fb9bf7bfe4 (patch) | |
tree | b39ac1a830a308cc000244bccfd70d41468268b3 /Lib | |
parent | f8d6f73f264f2adefdd87c03bebb66a069ead393 (diff) | |
parent | 8f26565ba9e3d32f6c953b04c1b9f9d13c2e1818 (diff) | |
download | cpython-abe4d52a1a175b784a5ccae6f31638fb9bf7bfe4.zip cpython-abe4d52a1a175b784a5ccae6f31638fb9bf7bfe4.tar.gz cpython-abe4d52a1a175b784a5ccae6f31638fb9bf7bfe4.tar.bz2 |
Merge doc and comment fixes from 3.5
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/gzip.py | 2 | ||||
-rw-r--r-- | Lib/optparse.py | 2 | ||||
-rw-r--r-- | Lib/test/test_tracemalloc.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/gzip.py b/Lib/gzip.py index 3a2b322..da4479e 100644 --- a/Lib/gzip.py +++ b/Lib/gzip.py @@ -133,7 +133,7 @@ class GzipFile(_compression.BaseStream): a file object. When fileobj is not None, the filename argument is only used to be - included in the gzip file header, which may includes the original + included in the gzip file header, which may include the original filename of the uncompressed file. It defaults to the filename of fileobj, if discernible; otherwise, it defaults to the empty string, and in this case the original filename is not included in the header. diff --git a/Lib/optparse.py b/Lib/optparse.py index 230a0f6..e8ac1e1 100644 --- a/Lib/optparse.py +++ b/Lib/optparse.py @@ -901,7 +901,7 @@ class OptionContainer: _short_opt : { string : Option } dictionary mapping short option strings, eg. "-f" or "-X", to the Option instances that implement them. If an Option - has multiple short option strings, it will appears in this + has multiple short option strings, it will appear in this dictionary multiple times. [1] _long_opt : { string : Option } dictionary mapping long option strings, eg. "--file" or diff --git a/Lib/test/test_tracemalloc.py b/Lib/test/test_tracemalloc.py index 359d9c0..790ab7e 100644 --- a/Lib/test/test_tracemalloc.py +++ b/Lib/test/test_tracemalloc.py @@ -261,7 +261,7 @@ class TestTracemallocEnabled(unittest.TestCase): snapshot.dump(support.TESTFN) self.addCleanup(support.unlink, support.TESTFN) - # load() should recreates the attribute + # load() should recreate the attribute snapshot2 = tracemalloc.Snapshot.load(support.TESTFN) self.assertEqual(snapshot2.test_attr, "new") |