summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-11-30 10:18:26 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-11-30 10:18:26 (GMT)
commitc8967002353864e012567125d7824abaeeb31dd3 (patch)
treebfeda9fe43a3dd0025ebf69708cb6442c61d0e4f /Include
parenta22e8bdfd92cd4f1bc3d60e91df6410c4efde6a0 (diff)
downloadcpython-c8967002353864e012567125d7824abaeeb31dd3.zip
cpython-c8967002353864e012567125d7824abaeeb31dd3.tar.gz
cpython-c8967002353864e012567125d7824abaeeb31dd3.tar.bz2
Partial fix for bug #1306
Multiple reinitializations of Python 3.0 failed on a system without a hardcoded default fs encoding. The patch makes sure that the default fs encoding is freed and reset to NULL on e.g. Linux. I've also taken the liberty to increase the debugging in Objects/object.c:_Py_ForgetReference(). The method is used to validate the reference chain. Reinitialization still fails in the 3rd round of my test suite: * ob object : <refcnt 0 at 0x821c840> type : str refcount: 0 address : 0x821c840 * op->_ob_prev->_ob_next object : <refcnt 0 at 0x821c840> type : str refcount: 0 address : 0x821c840 * op->_ob_next->_ob_prev object : bytearray(b'') type : bytearray refcount: 1 address : 0x826b838 Fatal Python error: UNREF invalid object
Diffstat (limited to 'Include')
-rw-r--r--Include/fileobject.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Include/fileobject.h b/Include/fileobject.h
index 40d871a..0f40089 100644
--- a/Include/fileobject.h
+++ b/Include/fileobject.h
@@ -20,6 +20,7 @@ PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
If non-NULL, this is different than the default encoding for strings
*/
PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding;
+PyAPI_DATA(const int) Py_HasFileSystemDefaultEncoding;
/* Internal API