summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-12-03 22:54:21 (GMT)
committerGuido van Rossum <guido@python.org>2007-12-03 22:54:21 (GMT)
commite7fc50f2d03a6b62e4b4201c89b2c0185c90f697 (patch)
tree836034eb187c29177ffaabb74b39ba16ed71ddd1 /Python
parentc6fe37bab927bd00e0f2fed8a431adb7d2b6d303 (diff)
downloadcpython-e7fc50f2d03a6b62e4b4201c89b2c0185c90f697.zip
cpython-e7fc50f2d03a6b62e4b4201c89b2c0185c90f697.tar.gz
cpython-e7fc50f2d03a6b62e4b4201c89b2c0185c90f697.tar.bz2
Add an errors parameter to open() and TextIOWrapper() to specify error handling.
Diffstat (limited to 'Python')
-rw-r--r--Python/import.c2
-rw-r--r--Python/pythonrun.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/Python/import.c b/Python/import.c
index 221c2dd..b7a9752 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2602,7 +2602,7 @@ call_find_module(char *name, PyObject *path)
(char*)PyUnicode_GetDefaultEncoding();
}
fob = PyFile_FromFd(fd, pathname, fdp->mode, -1,
- (char*)encoding, NULL, 1);
+ (char*)encoding, NULL, NULL, 1);
if (fob == NULL) {
close(fd);
PyMem_FREE(found_encoding);
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f46b90e..14fe783 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -770,7 +770,7 @@ initstdio(void)
#endif
}
else {
- if (!(std = PyFile_FromFd(fd, "<stdin>", "r", -1, NULL,
+ if (!(std = PyFile_FromFd(fd, "<stdin>", "r", -1, NULL, NULL,
"\n", 0))) {
goto error;
}
@@ -790,7 +790,7 @@ initstdio(void)
#endif
}
else {
- if (!(std = PyFile_FromFd(fd, "<stdout>", "w", -1, NULL,
+ if (!(std = PyFile_FromFd(fd, "<stdout>", "w", -1, NULL, NULL,
"\n", 0))) {
goto error;
}
@@ -811,7 +811,7 @@ initstdio(void)
#endif
}
else {
- if (!(std = PyFile_FromFd(fd, "<stderr>", "w", -1, NULL,
+ if (!(std = PyFile_FromFd(fd, "<stderr>", "w", -1, NULL, NULL,
"\n", 0))) {
goto error;
}