diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 04:03:08 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 04:03:08 (GMT) |
| commit | 373089239b26e7445aa44a3501c7056cfa4c3728 (patch) | |
| tree | 5f2f35ff686dfa64092b06b730ed9090f6492896 /Python | |
| parent | deaa678952dd437cb8cf9f697325705ad0855029 (diff) | |
| parent | 4969f709cc07088a40574c05724d83cddc8fafc7 (diff) | |
| download | cpython-373089239b26e7445aa44a3501c7056cfa4c3728.zip cpython-373089239b26e7445aa44a3501c7056cfa4c3728.tar.gz cpython-373089239b26e7445aa44a3501c7056cfa4c3728.tar.bz2 | |
#11515: Merge with 3.2.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/_warnings.c | 2 | ||||
| -rw-r--r-- | Python/sysmodule.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Python/_warnings.c b/Python/_warnings.c index 51c39e4..a797887 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -764,7 +764,7 @@ PyErr_WarnEx(PyObject *category, const char *text, Py_ssize_t stack_level) return ret; } -/* PyErr_Warn is only for backwards compatability and will be removed. +/* PyErr_Warn is only for backwards compatibility and will be removed. Use PyErr_WarnEx instead. */ #undef PyErr_Warn diff --git a/Python/sysmodule.c b/Python/sysmodule.c index d06adc0..31c6939 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -686,7 +686,7 @@ PyDoc_STRVAR(getwindowsversion_doc, Return information about the running version of Windows as a named tuple.\n\ The members are named: major, minor, build, platform, service_pack,\n\ service_pack_major, service_pack_minor, suite_mask, and product_type. For\n\ -backward compatibiliy, only the first 5 items are available by indexing.\n\ +backward compatibility, only the first 5 items are available by indexing.\n\ All elements are numbers, except service_pack which is a string. Platform\n\ may be 0 for win32s, 1 for Windows 9x/ME, 2 for Windows NT/2000/XP/Vista/7,\n\ 3 for Windows CE. Product_type may be 1 for a workstation, 2 for a domain\n\ |