Merge p3yk branch with the trunk up to revision 45595. This breaks a fair
number of tests, all because of the codecs/_multibytecodecs issue described
here (it's not a Py3K issue, just something Py3K discovers):
http://mail.python.org/pipermail/python-dev/2006-April/064051.html
Hye-Shik Chang promised to look for a fix, so no need to fix it here. The
tests that are expected to break are:
test_codecencodings_cn
test_codecencodings_hk
test_codecencodings_jp
test_codecencodings_kr
test_codecencodings_tw
test_codecs
test_multibytecodec
This merge fixes an actual test failure (test_weakref) in this branch,
though, so I believe merging is the right thing to do anyway.
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 875f73f..c6eb91f 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -600,10 +600,9 @@
static PyObject *
sys_gettotalrefcount(PyObject *self)
{
- return PyInt_FromSsize_t(_Py_RefTotal);
+ return PyInt_FromSsize_t(_Py_GetRefTotal());
}
-
-#endif /* Py_TRACE_REFS */
+#endif /* Py_REF_DEBUG */
PyDoc_STRVAR(getrefcount_doc,
"getrefcount(object) -> integer\n\
@@ -697,6 +696,10 @@
10. Number of stack pops performed by call_function()"
);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#ifdef Py_TRACE_REFS
/* Defined in objects.c because it uses static globals if that file */
extern PyObject *_Py_GetObjects(PyObject *, PyObject *);
@@ -707,6 +710,10 @@
extern PyObject *_Py_GetDXProfile(PyObject *, PyObject *);
#endif
+#ifdef __cplusplus
+}
+#endif
+
static PyMethodDef sys_methods[] = {
/* Might as well keep this in alphabetic order */
{"callstats", (PyCFunction)PyEval_GetCallStats, METH_NOARGS,
@@ -1065,6 +1072,11 @@
if (!PyFile_SetEncoding(sysout, buf))
return NULL;
}
+ if(isatty(_fileno(stderr))) {
+ sprintf(buf, "cp%d", GetConsoleOutputCP());
+ if (!PyFile_SetEncoding(syserr, buf))
+ return NULL;
+ }
#endif
PyDict_SetItemString(sysdict, "stdin", sysin);
@@ -1406,7 +1418,7 @@
PyErr_Clear();
fputs(buffer, fp);
}
- if (written < 0 || written >= sizeof(buffer)) {
+ if (written < 0 || (size_t)written >= sizeof(buffer)) {
const char *truncated = "... truncated";
if (PyFile_WriteString(truncated, file) != 0) {
PyErr_Clear();