diff options
| -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-- | Lib/test/test_codecs.py | 4 | ||||
| -rw-r--r-- | Modules/_io/bytesio.c | 4 | ||||
| -rw-r--r-- | Modules/_io/clinic/bytesio.c.h | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst index 6181ee2..03dda1a 100644 --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -923,7 +923,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 a613a9f..fb4558b 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 09b8897..7bb4d59 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -372,7 +372,7 @@ symbolic links encountered in the path.""" path, ok = _joinrealpath(filename[:0], 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 isinstance(path, bytes): diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py index c98afea..0479542 100644 --- a/Lib/test/test_codecs.py +++ b/Lib/test/test_codecs.py @@ -2355,7 +2355,7 @@ class TypesTest(unittest.TestCase): self.assertRaises(TypeError, decoder, "xxx") def test_unicode_escape(self): - # Escape-decoding a unicode string is supported ang gives the same + # Escape-decoding a unicode string is supported and gives the same # result as decoding the equivalent ASCII bytes string. self.assertEqual(codecs.unicode_escape_decode(r"\u1234"), ("\u1234", 6)) self.assertEqual(codecs.unicode_escape_decode(br"\u1234"), ("\u1234", 6)) @@ -2762,7 +2762,7 @@ class TransformCodecTest(unittest.TestCase): # type and a single str argument. # Use a local codec registry to avoid appearing to leak objects when -# registering multiple seach functions +# registering multiple search functions _TEST_CODECS = {} def _get_test_codec(codec_name): diff --git a/Modules/_io/bytesio.c b/Modules/_io/bytesio.c index 49174b4..058df47 100644 --- a/Modules/_io/bytesio.c +++ b/Modules/_io/bytesio.c @@ -551,12 +551,12 @@ _io.BytesIO.readinto Read up to len(buffer) bytes into buffer. Returns number of bytes read (0 for EOF), or None if the object -is set not to block as has no data to read. +is set not to block and has no data to read. [clinic start generated code]*/ static PyObject * _io_BytesIO_readinto_impl(bytesio *self, Py_buffer *buffer) -/*[clinic end generated code: output=a5d407217dcf0639 input=71581f32635c3a31]*/ +/*[clinic end generated code: output=a5d407217dcf0639 input=b52a8782706f0037]*/ { Py_ssize_t len, n; diff --git a/Modules/_io/clinic/bytesio.c.h b/Modules/_io/clinic/bytesio.c.h index 1ab1d65..e468215 100644 --- a/Modules/_io/clinic/bytesio.c.h +++ b/Modules/_io/clinic/bytesio.c.h @@ -262,7 +262,7 @@ PyDoc_STRVAR(_io_BytesIO_readinto__doc__, "Read up to len(buffer) bytes into buffer.\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."); #define _IO_BYTESIO_READINTO_METHODDEF \ {"readinto", (PyCFunction)_io_BytesIO_readinto, METH_O, _io_BytesIO_readinto__doc__}, @@ -419,4 +419,4 @@ _io_BytesIO___init__(PyObject *self, PyObject *args, PyObject *kwargs) exit: return return_value; } -/*[clinic end generated code: output=500ccc149587fac4 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=164cf0e4117dadbe input=a9049054013a1b77]*/ |