From f0564164bab43f078c9f84f334d72ddb0e69110c Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Sun, 8 May 2016 13:48:10 +0000 Subject: Fix typos in comments, documentation and test method names --- Doc/howto/logging-cookbook.rst | 2 +- Doc/reference/simple_stmts.rst | 2 +- Lib/http/cookiejar.py | 2 +- Lib/idlelib/ChangeLog | 2 +- Lib/test/test_descr.py | 2 +- Lib/test/test_module.py | 2 +- Lib/tkinter/__init__.py | 4 ++-- Lib/urllib/robotparser.py | 2 +- Mac/BuildScript/scripts/postflight.patch-profile | 4 ++-- Misc/NEWS | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst index 57b4333..e784acc 100644 --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -2231,7 +2231,7 @@ flushing behavior. The example script has a simple function, ``foo``, which just cycles through all the logging levels, writing to ``sys.stderr`` to say what level it's about -to log at, and then actually logging a message that that level. You can pass a +to log at, and then actually logging a message at that level. You can pass a parameter to ``foo`` which, if true, will log at ERROR and CRITICAL levels - otherwise, it only logs at DEBUG, INFO and WARNING levels. diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index 5f60540..79a46e2 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -237,7 +237,7 @@ Assignment of an object to a single target is recursively defined as follows. phase, causing less detailed error messages. Although the definition of assignment implies that overlaps between the -left-hand side and the right-hand side are 'simultanenous' (for example ``a, b = +left-hand side and the right-hand side are 'simultaneous' (for example ``a, b = b, a`` swaps two variables), overlaps *within* the collection of assigned-to variables occur left-to-right, sometimes resulting in confusion. For instance, the following program prints ``[0, 2]``:: diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py index bd367f9..265ccf9 100644 --- a/Lib/http/cookiejar.py +++ b/Lib/http/cookiejar.py @@ -1841,7 +1841,7 @@ def lwp_cookie_str(cookie): class LWPCookieJar(FileCookieJar): """ The LWPCookieJar saves a sequence of "Set-Cookie3" lines. - "Set-Cookie3" is the format used by the libwww-perl libary, not known + "Set-Cookie3" is the format used by the libwww-perl library, not known to be compatible with any browser, but which is easy to read and doesn't lose information about RFC 2965 cookies. diff --git a/Lib/idlelib/ChangeLog b/Lib/idlelib/ChangeLog index 90e02f6..0c36664 100644 --- a/Lib/idlelib/ChangeLog +++ b/Lib/idlelib/ChangeLog @@ -1574,7 +1574,7 @@ Mon Oct 12 23:59:27 1998 Guido van Rossum * Attic/PopupMenu.py: Pass a root to the help window. * SearchBinding.py: - Add parent argument to 'to to line number' dialog box. + Add parent argument to 'go to line number' dialog box. Sat Oct 10 19:15:32 1998 Guido van Rossum diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index a8206d3..92767ec 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -3489,7 +3489,7 @@ order (MRO) for bases """ b.a = a z = deepcopy(a) # This blew up before - def test_unintialized_modules(self): + def test_uninitialized_modules(self): # Testing uninitialized module objects... from types import ModuleType as M m = M.__new__(M) diff --git a/Lib/test/test_module.py b/Lib/test/test_module.py index 48ab0b4..3a076b3 100644 --- a/Lib/test/test_module.py +++ b/Lib/test/test_module.py @@ -30,7 +30,7 @@ class ModuleTests(unittest.TestCase): pass self.assertEqual(foo.__doc__, ModuleType.__doc__) - def test_unintialized_missing_getattr(self): + def test_uninitialized_missing_getattr(self): # Issue 8297 # test the text in the AttributeError of an uninitialized module foo = ModuleType.__new__(ModuleType) diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index be6ed75..82ac712 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -1249,7 +1249,7 @@ class Misc: nsign, b, f, h, k, s, t, w, x, y, A, E, K, N, W, T, X, Y, D = args # Missing: (a, c, d, m, o, v, B, R) e = Event() - # serial field: valid vor all events + # serial field: valid for all events # number of button: ButtonPress and ButtonRelease events only # height field: Configure, ConfigureRequest, Create, # ResizeRequest, and Expose events only @@ -1261,7 +1261,7 @@ class Misc: # y field: "valid for events that contain a y field" # keysym as decimal: KeyPress and KeyRelease events only # x_root, y_root fields: ButtonPress, ButtonRelease, KeyPress, - # KeyRelease,and Motion events + # KeyRelease, and Motion events e.serial = getint(nsign) e.num = getint_event(b) try: e.focus = getboolean(f) diff --git a/Lib/urllib/robotparser.py b/Lib/urllib/robotparser.py index 4fbb0cb..8b69fd9 100644 --- a/Lib/urllib/robotparser.py +++ b/Lib/urllib/robotparser.py @@ -132,7 +132,7 @@ class RobotFileParser: return True # Until the robots.txt file has been read or found not # to exist, we must assume that no url is allowable. - # This prevents false positives when a user erronenously + # This prevents false positives when a user erroneously # calls can_fetch() before calling read(). if not self.last_checked: return False diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile index 36d0a3e..0a62e32 100755 --- a/Mac/BuildScript/scripts/postflight.patch-profile +++ b/Mac/BuildScript/scripts/postflight.patch-profile @@ -58,7 +58,7 @@ case "${BSH}" in fi echo "" >> "${RC}" echo "# Setting PATH for Python ${PYVER}" >> "${RC}" - echo "# The orginal version is saved in .cshrc.pysave" >> "${RC}" + echo "# The original version is saved in .cshrc.pysave" >> "${RC}" echo "set path=(${PYTHON_ROOT}/bin "'$path'")" >> "${RC}" if [ `id -ur` = 0 ]; then chown "${USER}" "${RC}" @@ -90,7 +90,7 @@ if [ -f "${PR}" ]; then fi echo "" >> "${PR}" echo "# Setting PATH for Python ${PYVER}" >> "${PR}" -echo "# The orginal version is saved in `basename ${PR}`.pysave" >> "${PR}" +echo "# The original version is saved in `basename ${PR}`.pysave" >> "${PR}" echo 'PATH="'"${PYTHON_ROOT}/bin"':${PATH}"' >> "${PR}" echo 'export PATH' >> "${PR}" if [ `id -ur` = 0 ]; then diff --git a/Misc/NEWS b/Misc/NEWS index 3d0a4d0..f31b172 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -2674,7 +2674,7 @@ Library is run with pythonw.exe. - Issue #21775: shutil.copytree(): fix crash when copying to VFAT. An exception - handler assumed that that OSError objects always have a 'winerror' attribute. + handler assumed that OSError objects always have a 'winerror' attribute. That is not the case, so the exception handler itself raised AttributeError when run on Linux (and, presumably, any other non-Windows OS). Patch by Greg Ward. -- cgit v0.12 From 4c35964b764540988bfb342bffc7c4b1cb674031 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Sun, 8 May 2016 13:53:41 +0000 Subject: Corrections for a/an in code comments and documentation --- Doc/library/codecs.rst | 2 +- Include/pythonrun.h | 2 +- Lib/pickletools.py | 8 ++++---- Lib/tkinter/__init__.py | 2 +- Mac/README | 2 +- Modules/arraymodule.c | 2 +- Modules/audioop.c | 4 ++-- PC/pyconfig.h | 2 +- Python/formatter_unicode.c | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index 49068cb..577a800 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -977,7 +977,7 @@ particular, the following variants typically exist: * an ISO 8859 codeset -* a Microsoft Windows code page, which is typically derived from a 8859 codeset, +* a Microsoft Windows code page, which is typically derived from an 8859 codeset, but replaces control characters with additional graphic characters * an IBM EBCDIC code page diff --git a/Include/pythonrun.h b/Include/pythonrun.h index f92148d..9c2e813 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -176,7 +176,7 @@ PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState; /* Stack size, in "pointers" (so we get extra safety margins on 64-bit platforms). On a 32-bit platform, this translates - to a 8k margin. */ + to an 8k margin. */ #define PYOS_STACK_MARGIN 2048 #if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1300 diff --git a/Lib/pickletools.py b/Lib/pickletools.py index 155bd5b..16ae7d5 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -590,7 +590,7 @@ bytes8 = ArgumentDescriptor( reader=read_bytes8, doc="""A counted bytes string. - The first argument is a 8-byte little-endian unsigned int giving + The first argument is an 8-byte little-endian unsigned int giving the number of bytes, and the second argument is that many bytes. """) @@ -734,7 +734,7 @@ unicodestring8 = ArgumentDescriptor( reader=read_unicodestring8, doc="""A counted Unicode string. - The first argument is a 8-byte little-endian signed int + The first argument is an 8-byte little-endian signed int giving the number of bytes in the string, and the second argument-- the UTF-8 encoding of the Unicode string -- contains that many bytes. @@ -1330,7 +1330,7 @@ opcodes = [ proto=4, doc="""Push a Python bytes object. - There are two arguments: the first is a 8-byte unsigned int giving + There are two arguments: the first is an 8-byte unsigned int giving the number of bytes in the string, and the second is that many bytes, which are taken literally as the string content. """), @@ -1417,7 +1417,7 @@ opcodes = [ proto=4, doc="""Push a Python Unicode string object. - There are two arguments: the first is a 8-byte little-endian signed int + There are two arguments: the first is an 8-byte little-endian signed int giving the number of bytes in the string. The second is that many bytes, and is the UTF-8 encoding of the Unicode string. """), diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 82ac712..151b30f 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -1257,7 +1257,7 @@ class Misc: # time field: "valid for events that contain a time field" # width field: Configure, ConfigureRequest, Create, ResizeRequest, # and Expose events only - # x field: "valid for events that contain a x field" + # x field: "valid for events that contain an x field" # y field: "valid for events that contain a y field" # keysym as decimal: KeyPress and KeyRelease events only # x_root, y_root fields: ButtonPress, ButtonRelease, KeyPress, diff --git a/Mac/README b/Mac/README index 6e08fdc..b4c6b7f 100644 --- a/Mac/README +++ b/Mac/README @@ -126,7 +126,7 @@ values are available: To build a universal binary that includes a 64-bit architecture, you must build on a system running OS X 10.5 or later. The ``all`` and ``64-bit`` flavors can -only be built with an 10.5 SDK because ``ppc64`` support was only included with +only be built with a 10.5 SDK because ``ppc64`` support was only included with OS X 10.5. Although legacy ``ppc`` support was included with Xcode 3 on OS X 10.6, it was removed in Xcode 4, versions of which were released on OS X 10.6 and which is the standard for OS X 10.7. To summarize, the diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index 6af75a4..f73c599 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -2090,7 +2090,7 @@ array__array_reconstructor_impl(PyModuleDef *module, PyTypeObject *arraytype, * that fits better. This may result in an array with narrower * or wider elements. * - * For example, if a 32-bit machine pickles a L-code array of + * For example, if a 32-bit machine pickles an L-code array of * unsigned longs, then the array will be unpickled by 64-bit * machine as an I-code array of unsigned ints. * diff --git a/Modules/audioop.c b/Modules/audioop.c index 3b05aec..306937e 100644 --- a/Modules/audioop.c +++ b/Modules/audioop.c @@ -46,7 +46,7 @@ fbound(double val, double minval, double maxval) */ #define BIAS 0x84 /* define the add-in bias for 16 bit samples */ #define CLIP 32635 -#define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */ +#define SIGN_BIT (0x80) /* Sign bit for an A-law byte. */ #define QUANT_MASK (0xf) /* Quantization field mask. */ #define SEG_SHIFT (4) /* Left shift for segment number. */ #define SEG_MASK (0x70) /* Segment field mask. */ @@ -217,7 +217,7 @@ static PyInt16 _st_alaw2linear16[256] = { }; /* - * linear2alaw() accepts an 13-bit signed integer and encodes it as A-law data + * linear2alaw() accepts a 13-bit signed integer and encodes it as A-law data * stored in an unsigned char. This function should only be called with * the data shifted such that it only contains information in the lower * 13-bits. diff --git a/PC/pyconfig.h b/PC/pyconfig.h index d44173a..ac4f8f2 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -347,7 +347,7 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ # define SIZEOF_FPOS_T 8 # define SIZEOF_HKEY 4 # define SIZEOF_SIZE_T 4 - /* MS VS2005 changes time_t to an 64-bit type on all platforms */ + /* MS VS2005 changes time_t to a 64-bit type on all platforms */ # if defined(_MSC_VER) && _MSC_VER >= 1400 # define SIZEOF_TIME_T 8 # else diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c index 056bb76..8e9c502 100644 --- a/Python/formatter_unicode.c +++ b/Python/formatter_unicode.c @@ -1042,7 +1042,7 @@ format_float_internal(PyObject *value, else if (type == 'r') type = 'g'; - /* Cast "type", because if we're in unicode we need to pass a + /* Cast "type", because if we're in unicode we need to pass an 8-bit char. This is safe, because we've restricted what "type" can be. */ buf = PyOS_double_to_string(val, (char)type, precision, flags, @@ -1221,7 +1221,7 @@ format_complex_internal(PyObject *value, else if (type == 'r') type = 'g'; - /* Cast "type", because if we're in unicode we need to pass a + /* Cast "type", because if we're in unicode we need to pass an 8-bit char. This is safe, because we've restricted what "type" can be. */ re_buf = PyOS_double_to_string(re, (char)type, precision, flags, -- cgit v0.12