summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-11-30 22:12:06 (GMT)
committerChristian Heimes <christian@cheimes.de>2007-11-30 22:12:06 (GMT)
commit4e30a845b4d2496dab25f0016cb597072c7355b1 (patch)
tree53b84c8cc1edd2c893359b8a7552b38425b7e91a /Python
parent04a4eb3405eab76285a7693add2c4f00128fdf74 (diff)
downloadcpython-4e30a845b4d2496dab25f0016cb597072c7355b1.zip
cpython-4e30a845b4d2496dab25f0016cb597072c7355b1.tar.gz
cpython-4e30a845b4d2496dab25f0016cb597072c7355b1.tar.bz2
Merged revisions 59239-59244 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r59240 | amaury.forgeotdarc | 2007-11-30 21:37:22 +0100 (Fri, 30 Nov 2007) | 2 lines Add a NEWS entry for r59231 ........ r59241 | amaury.forgeotdarc | 2007-11-30 21:51:40 +0100 (Fri, 30 Nov 2007) | 5 lines Issue #1521: on 64bit platforms, str.decode fails on very long strings. The t# and w# formats were not correctly handled. Will backport. ........ r59242 | christian.heimes | 2007-11-30 22:11:28 +0100 (Fri, 30 Nov 2007) | 3 lines Fix for feature request #1528 Add os.fchmod Georg Brandl has added fchmod() and fchown(). I've contributed lchown but I'm not able to test it on Linux. However it should be available on Mac and some other flavors of Unix. I've made a quick test of fchmod() and fchown() on my system. They are working as expected. ........
Diffstat (limited to 'Python')
-rw-r--r--Python/getargs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/getargs.c b/Python/getargs.c
index 584805e..f6cdd7c 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -1182,7 +1182,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
case 'w': { /* memory buffer, read-write access */
void **p = va_arg(*p_va, void **);
PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
- int count;
+ Py_ssize_t count;
int temp=-1;
Py_buffer view;
@@ -1216,7 +1216,7 @@ convertsimple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
case 't': { /* 8-bit character buffer, read-only access */
char **p = va_arg(*p_va, char **);
PyBufferProcs *pb = arg->ob_type->tp_as_buffer;
- int count;
+ Py_ssize_t count;
Py_buffer view;
if (*format++ != '#')