diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-04-16 09:28:57 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-04-16 09:28:57 (GMT) |
| commit | bf02d18844ff1087225394083f62e4ee8e1db072 (patch) | |
| tree | fa9ecd4a068ce2bdf3be245ec30e569eb7ccbc4d | |
| parent | fb45216da81610dc3166237a628cd7bf0db12f0a (diff) | |
| download | cpython-bf02d18844ff1087225394083f62e4ee8e1db072.zip cpython-bf02d18844ff1087225394083f62e4ee8e1db072.tar.gz cpython-bf02d18844ff1087225394083f62e4ee8e1db072.tar.bz2 | |
Fix typos in code comment and documentation
| -rw-r--r-- | Doc/library/argparse.rst | 2 | ||||
| -rw-r--r-- | Doc/whatsnew/2.4.rst | 2 | ||||
| -rw-r--r-- | Lib/posixpath.py | 2 | ||||
| -rw-r--r-- | Modules/_io/bytesio.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst index c7b8cb7..2ea4b83 100644 --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -878,7 +878,7 @@ the various :class:`ArgumentParser` actions. The two most common uses of it are See the nargs_ description for examples. With the ``'store_const'`` and ``'append_const'`` actions, the ``const`` -keyword argument must be given. For other actions, is defaults to ``None``. +keyword argument must be given. For other actions, it defaults to ``None``. default diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst index 00a996d..5555e7d 100644 --- a/Doc/whatsnew/2.4.rst +++ b/Doc/whatsnew/2.4.rst @@ -1481,7 +1481,7 @@ Some of the changes to Python's build process and to the C API are: * Python can now be built with additional profiling for the interpreter itself, intended as an aid to people developing the Python core. Providing - :option:`----enable-profiling` to the :program:`configure` script will let you + :option:`--enable-profiling` to the :program:`configure` script will let you profile the interpreter with :program:`gprof`, and providing the :option:`--with-tsc` switch enables profiling using the Pentium's Time-Stamp- Counter register. Note that the :option:`--with-tsc` switch is slightly diff --git a/Lib/posixpath.py b/Lib/posixpath.py index 6578481..8f92822 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -375,7 +375,7 @@ symbolic links encountered in the path.""" path, ok = _joinrealpath('', filename, {}) return abspath(path) -# Join two paths, normalizing ang eliminating any symbolic links +# Join two paths, normalizing and eliminating any symbolic links # encountered in the second path. def _joinrealpath(path, rest, seen): if isabs(rest): diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index 82f3851..d575236 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -395,7 +395,7 @@ PyDoc_STRVAR(readinto_doc, "readinto(bytearray) -> int. Read up to len(b) bytes into b.\n" "\n" "Returns number of bytes read (0 for EOF), or None if the object\n" -"is set not to block as has no data to read."); +"is set not to block and has no data to read."); static PyObject * bytesio_readinto(bytesio *self, PyObject *args) |