summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-01-13 23:19:08 +0000
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2009-01-13 23:19:08 +0000
commita18392a324ba9ee8b267ac9181a67751d8150abc (patch)
tree84eba52a92f9a0f96ef9194a3d7ccfd920922b54
parentc2f02216b69b844e233a2bd86ba43508fee55c86 (diff)
downloadcpython-git-a18392a324ba9ee8b267ac9181a67751d8150abc.tar.gz
#4807: Remove a wrong usage of wsprintf in the winreg module
("windows sprintf", different than swprintf) Needed for the windows CE port.
-rw-r--r--Misc/NEWS2
-rw-r--r--PC/_winreg.c16
2 files changed, 8 insertions, 10 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index f9122bbc13..7939323584 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.7 alpha 1
Core and Builtins
-----------------
+- Issue #4807: Port the _winreg module to Windows CE.
+
- Issue #4935: The overflow checking code in the expandtabs() method common
to str, bytes and bytearray could be optimized away by the compiler, letting
the interpreter segfault instead of raising an error.
diff --git a/PC/_winreg.c b/PC/_winreg.c
index 74d33437bc..0cb516a781 100644
--- a/PC/_winreg.c
+++ b/PC/_winreg.c
@@ -410,21 +410,17 @@ PyHKEY_intFunc(PyObject *ob)
static int
PyHKEY_printFunc(PyObject *ob, FILE *fp, int flags)
{
- PyHKEYObject *pyhkey = (PyHKEYObject *)ob;
- char resBuf[160];
- wsprintf(resBuf, "<PyHKEY at %p (%p)>",
- ob, pyhkey->hkey);
- fputs(resBuf, fp);
- return 0;
+ PyHKEYObject *pyhkey = (PyHKEYObject *)ob;
+ fprintf(fp, "<PyHKEY at %p (%p)>",
+ ob, pyhkey->hkey);
+ return 0;
}
static PyObject *
PyHKEY_strFunc(PyObject *ob)
{
- PyHKEYObject *pyhkey = (PyHKEYObject *)ob;
- char resBuf[160];
- wsprintf(resBuf, "<PyHKEY:%p>", pyhkey->hkey);
- return PyString_FromString(resBuf);
+ PyHKEYObject *pyhkey = (PyHKEYObject *)ob;
+ return PyString_FromFormat("<PyHKEY:%p>", pyhkey->hkey);
}
static int