summaryrefslogtreecommitdiffstats
path: root/Python/getargs.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-08-29 18:38:11 (GMT)
committerGuido van Rossum <guido@python.org>2007-08-29 18:38:11 (GMT)
commitfb67be2f6b12e6ab07c17ece1caaf0057d610252 (patch)
tree1cc5f5a63ff45d5dd716a502432ed0db15c5596b /Python/getargs.c
parente86254e2560250ce958330433488ba092ca8ffea (diff)
downloadcpython-fb67be2f6b12e6ab07c17ece1caaf0057d610252.zip
cpython-fb67be2f6b12e6ab07c17ece1caaf0057d610252.tar.gz
cpython-fb67be2f6b12e6ab07c17ece1caaf0057d610252.tar.bz2
Three patches from issue #1047, by Amaury Forgeot d'Arc:
1/ getargs.diff adds the 'Z' and 'Z#' format specifiers for PyArg_ParseTuple. They mimic z and z# for unicode strings, by accepting a Unicode or None (in which case the Py_UNICODE* pointer is set to NULL). With doc and tests. 2/ subprocess.diff converts file PC/_subprocess.c to unicode. We use the Unicode version of the win32 api (and Z conversion from previous patch) 3/ stdout.diff: sys.stdout must not convert the line endings, Windows already does it. Without this patch, when redirecting the output of python, the file contains \r\r\n for each line. (test_subprocess did catch this) However, I (GvR) removed the change to _fileio.c (included in the patches) that prevents closing file descripors < 3 from being closed; I think that needs to be solved in a different way.
Diffstat (limited to 'Python/getargs.c')
-rw-r--r--Python/getargs.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index a0aa872..8d90111 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -921,6 +921,34 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
break;
}
+ case 'Z': {/* unicode, may be NULL (None) */
+ if (*format == '#') { /* any buffer-like object */
+ Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);
+ FETCH_SIZE;
+
+ if (arg == Py_None) {
+ *p = 0;
+ STORE_SIZE(0);
+ }
+ else if (PyUnicode_Check(arg)) {
+ *p = PyUnicode_AS_UNICODE(arg);
+ STORE_SIZE(PyUnicode_GET_SIZE(arg));
+ }
+ format++;
+ } else {
+ Py_UNICODE **p = va_arg(*p_va, Py_UNICODE **);
+
+ if (arg == Py_None)
+ *p = 0;
+ else if (PyUnicode_Check(arg))
+ *p = PyUnicode_AS_UNICODE(arg);
+ else
+ return converterr("string or None",
+ arg, msgbuf, bufsize);
+ }
+ break;
+ }
+
case 'e': {/* encoded string */
char **buffer;
const char *encoding;