mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#11515: Merge with 3.1.

Browse source
This commit is contained in:
Ezio Melotti 2011-03-15 05:59:46 +02:00
commit 4969f709cc
49 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/_warnings.c
View file

@ -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

2
Python/sysmodule.c
View file

@ -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\