diff options
| -rw-r--r-- | Doc/library/codecs.rst | 2 | ||||
| -rw-r--r-- | Include/pythonrun.h | 2 | ||||
| -rw-r--r-- | Lib/pickletools.py | 8 | ||||
| -rw-r--r-- | Lib/tkinter/__init__.py | 2 | ||||
| -rw-r--r-- | Mac/README | 2 | ||||
| -rw-r--r-- | Modules/arraymodule.c | 2 | ||||
| -rw-r--r-- | Modules/audioop.c | 4 | ||||
| -rw-r--r-- | PC/pyconfig.h | 2 | ||||
| -rw-r--r-- | 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, @@ -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, |