[Python-checkins] cpython: Fixed converting errors in the binascii module (issue20151).
serhiy.storchaka
python-checkins at python.org
Sat Jan 25 10:49:57 CET 2014
http://hg.python.org/cpython/rev/76a3cc6f3aca
changeset: 88686:76a3cc6f3aca
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sat Jan 25 11:49:49 2014 +0200
summary:
Fixed converting errors in the binascii module (issue20151).
a2b_qp() now accepts keyword arguments.
All "ascii" parameters is renamed to "data" for consistancy with a2b_qp().
files:
Modules/binascii.c | 73 +++++++++++++-------------
Modules/binascii.clinic.c | 51 +++++++++---------
2 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/Modules/binascii.c b/Modules/binascii.c
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -241,15 +241,15 @@
/*[clinic input]
binascii.a2b_uu
- ascii: ascii_buffer
+ data: ascii_buffer
/
Decode a line of uuencoded data.
[clinic start generated code]*/
static PyObject *
-binascii_a2b_uu_impl(PyModuleDef *module, Py_buffer *ascii)
-/*[clinic end generated code: checksum=3252d1dbb682979eee03fb2c0c48a4d98a229df4]*/
+binascii_a2b_uu_impl(PyModuleDef *module, Py_buffer *data)
+/*[clinic end generated code: checksum=5779f39b0b48459ff0f7a365d7e69b57422e2a4a]*/
{
unsigned char *ascii_data, *bin_data;
int leftbits = 0;
@@ -258,8 +258,8 @@
PyObject *rv;
Py_ssize_t ascii_len, bin_len;
- ascii_data = ascii->buf;
- ascii_len = ascii->len;
+ ascii_data = data->buf;
+ ascii_len = data->len;
assert(ascii_len >= 0);
@@ -414,15 +414,15 @@
/*[clinic input]
binascii.a2b_base64
- ascii: ascii_buffer
+ data: ascii_buffer
/
Decode a line of base64 data.
[clinic start generated code]*/
static PyObject *
-binascii_a2b_base64_impl(PyModuleDef *module, Py_buffer *ascii)
-/*[clinic end generated code: checksum=73c265f87068c1f3e4bc01834ae6ac5a974143b4]*/
+binascii_a2b_base64_impl(PyModuleDef *module, Py_buffer *data)
+/*[clinic end generated code: checksum=3e351b702bed56d249caa4aa0f1bb3fae7546025]*/
{
unsigned char *ascii_data, *bin_data;
int leftbits = 0;
@@ -432,8 +432,8 @@
Py_ssize_t ascii_len, bin_len;
int quad_pos = 0;
- ascii_data = ascii->buf;
- ascii_len = ascii->len;
+ ascii_data = data->buf;
+ ascii_len = data->len;
assert(ascii_len >= 0);
@@ -589,15 +589,15 @@
/*[clinic input]
binascii.a2b_hqx
- ascii: ascii_buffer
+ data: ascii_buffer
/
Decode .hqx coding.
[clinic start generated code]*/
static PyObject *
-binascii_a2b_hqx_impl(PyModuleDef *module, Py_buffer *ascii)
-/*[clinic end generated code: checksum=48075dc4017b66f93086386d5b5848f1e6af260c]*/
+binascii_a2b_hqx_impl(PyModuleDef *module, Py_buffer *data)
+/*[clinic end generated code: checksum=60bcdbbd28b105cd7091d98e70a6e458f8039e9e]*/
{
unsigned char *ascii_data, *bin_data;
int leftbits = 0;
@@ -607,8 +607,8 @@
Py_ssize_t len;
int done = 0;
- ascii_data = ascii->buf;
- len = ascii->len;
+ ascii_data = data->buf;
+ len = data->len;
assert(len >= 0);
@@ -1235,25 +1235,24 @@
/*[clinic input]
binascii.a2b_qp
- ascii: ascii_buffer
+ data: ascii_buffer
header: int(c_default="0") = False
- /
Decode a string of qp-encoded data.
[clinic start generated code]*/
static PyObject *
-binascii_a2b_qp_impl(PyModuleDef *module, Py_buffer *ascii, int header)
-/*[clinic end generated code: checksum=33910d5b347bf9f33203769e649f35ea41694b71]*/
+binascii_a2b_qp_impl(PyModuleDef *module, Py_buffer *data, int header)
+/*[clinic end generated code: checksum=a44ef8827035211431d0906a76dbfe97e59a5079]*/
{
Py_ssize_t in, out;
char ch;
- unsigned char *data, *odata;
+ unsigned char *ascii_data, *odata;
Py_ssize_t datalen = 0;
PyObject *rv;
- data = ascii->buf;
- datalen = ascii->len;
+ ascii_data = data->buf;
+ datalen = data->len;
/* We allocate the output same size as input, this is overkill.
* The previous implementation used calloc() so we'll zero out the
@@ -1268,31 +1267,31 @@
in = out = 0;
while (in < datalen) {
- if (data[in] == '=') {
+ if (ascii_data[in] == '=') {
in++;
if (in >= datalen) break;
/* Soft line breaks */
- if ((data[in] == '\n') || (data[in] == '\r')) {
- if (data[in] != '\n') {
- while (in < datalen && data[in] != '\n') in++;
+ if ((ascii_data[in] == '\n') || (ascii_data[in] == '\r')) {
+ if (ascii_data[in] != '\n') {
+ while (in < datalen && ascii_data[in] != '\n') in++;
}
if (in < datalen) in++;
}
- else if (data[in] == '=') {
+ else if (ascii_data[in] == '=') {
/* broken case from broken python qp */
odata[out++] = '=';
in++;
}
- else if (((data[in] >= 'A' && data[in] <= 'F') ||
- (data[in] >= 'a' && data[in] <= 'f') ||
- (data[in] >= '0' && data[in] <= '9')) &&
- ((data[in+1] >= 'A' && data[in+1] <= 'F') ||
- (data[in+1] >= 'a' && data[in+1] <= 'f') ||
- (data[in+1] >= '0' && data[in+1] <= '9'))) {
+ else if (((ascii_data[in] >= 'A' && ascii_data[in] <= 'F') ||
+ (ascii_data[in] >= 'a' && ascii_data[in] <= 'f') ||
+ (ascii_data[in] >= '0' && ascii_data[in] <= '9')) &&
+ ((ascii_data[in+1] >= 'A' && ascii_data[in+1] <= 'F') ||
+ (ascii_data[in+1] >= 'a' && ascii_data[in+1] <= 'f') ||
+ (ascii_data[in+1] >= '0' && ascii_data[in+1] <= '9'))) {
/* hexval */
- ch = hexval(data[in]) << 4;
+ ch = hexval(ascii_data[in]) << 4;
in++;
- ch |= hexval(data[in]);
+ ch |= hexval(ascii_data[in]);
in++;
odata[out++] = ch;
}
@@ -1300,12 +1299,12 @@
odata[out++] = '=';
}
}
- else if (header && data[in] == '_') {
+ else if (header && ascii_data[in] == '_') {
odata[out++] = ' ';
in++;
}
else {
- odata[out] = data[in];
+ odata[out] = ascii_data[in];
in++;
out++;
}
diff --git a/Modules/binascii.clinic.c b/Modules/binascii.clinic.c
--- a/Modules/binascii.clinic.c
+++ b/Modules/binascii.clinic.c
@@ -3,26 +3,26 @@
[clinic start generated code]*/
PyDoc_STRVAR(binascii_a2b_uu__doc__,
-"a2b_uu(module, ascii)\n"
+"a2b_uu(module, data)\n"
"Decode a line of uuencoded data.");
#define BINASCII_A2B_UU_METHODDEF \
{"a2b_uu", (PyCFunction)binascii_a2b_uu, METH_VARARGS, binascii_a2b_uu__doc__},
static PyObject *
-binascii_a2b_uu_impl(PyModuleDef *module, Py_buffer *ascii);
+binascii_a2b_uu_impl(PyModuleDef *module, Py_buffer *data);
static PyObject *
binascii_a2b_uu(PyModuleDef *module, PyObject *args)
{
PyObject *return_value = NULL;
- Py_buffer ascii;
+ Py_buffer data;
if (!PyArg_ParseTuple(args,
"O&:a2b_uu",
- ascii_buffer_converter, &ascii))
+ ascii_buffer_converter, &data))
goto exit;
- return_value = binascii_a2b_uu_impl(module, &ascii);
+ return_value = binascii_a2b_uu_impl(module, &data);
exit:
return return_value;
@@ -59,26 +59,26 @@
}
PyDoc_STRVAR(binascii_a2b_base64__doc__,
-"a2b_base64(module, ascii)\n"
+"a2b_base64(module, data)\n"
"Decode a line of base64 data.");
#define BINASCII_A2B_BASE64_METHODDEF \
{"a2b_base64", (PyCFunction)binascii_a2b_base64, METH_VARARGS, binascii_a2b_base64__doc__},
static PyObject *
-binascii_a2b_base64_impl(PyModuleDef *module, Py_buffer *ascii);
+binascii_a2b_base64_impl(PyModuleDef *module, Py_buffer *data);
static PyObject *
binascii_a2b_base64(PyModuleDef *module, PyObject *args)
{
PyObject *return_value = NULL;
- Py_buffer ascii;
+ Py_buffer data;
if (!PyArg_ParseTuple(args,
"O&:a2b_base64",
- ascii_buffer_converter, &ascii))
+ ascii_buffer_converter, &data))
goto exit;
- return_value = binascii_a2b_base64_impl(module, &ascii);
+ return_value = binascii_a2b_base64_impl(module, &data);
exit:
return return_value;
@@ -115,26 +115,26 @@
}
PyDoc_STRVAR(binascii_a2b_hqx__doc__,
-"a2b_hqx(module, ascii)\n"
+"a2b_hqx(module, data)\n"
"Decode .hqx coding.");
#define BINASCII_A2B_HQX_METHODDEF \
{"a2b_hqx", (PyCFunction)binascii_a2b_hqx, METH_VARARGS, binascii_a2b_hqx__doc__},
static PyObject *
-binascii_a2b_hqx_impl(PyModuleDef *module, Py_buffer *ascii);
+binascii_a2b_hqx_impl(PyModuleDef *module, Py_buffer *data);
static PyObject *
binascii_a2b_hqx(PyModuleDef *module, PyObject *args)
{
PyObject *return_value = NULL;
- Py_buffer ascii;
+ Py_buffer data;
if (!PyArg_ParseTuple(args,
"O&:a2b_hqx",
- ascii_buffer_converter, &ascii))
+ ascii_buffer_converter, &data))
goto exit;
- return_value = binascii_a2b_hqx_impl(module, &ascii);
+ return_value = binascii_a2b_hqx_impl(module, &data);
exit:
return return_value;
@@ -363,27 +363,28 @@
}
PyDoc_STRVAR(binascii_a2b_qp__doc__,
-"a2b_qp(module, ascii, header=False)\n"
+"a2b_qp(module, data, header=False)\n"
"Decode a string of qp-encoded data.");
#define BINASCII_A2B_QP_METHODDEF \
- {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_VARARGS, binascii_a2b_qp__doc__},
+ {"a2b_qp", (PyCFunction)binascii_a2b_qp, METH_VARARGS|METH_KEYWORDS, binascii_a2b_qp__doc__},
static PyObject *
-binascii_a2b_qp_impl(PyModuleDef *module, Py_buffer *ascii, int header);
+binascii_a2b_qp_impl(PyModuleDef *module, Py_buffer *data, int header);
static PyObject *
-binascii_a2b_qp(PyModuleDef *module, PyObject *args)
+binascii_a2b_qp(PyModuleDef *module, PyObject *args, PyObject *kwargs)
{
PyObject *return_value = NULL;
- Py_buffer ascii;
+ static char *_keywords[] = {"data", "header", NULL};
+ Py_buffer data;
int header = 0;
- if (!PyArg_ParseTuple(args,
- "O&|i:a2b_qp",
- ascii_buffer_converter, &ascii, &header))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ "O&|i:a2b_qp", _keywords,
+ ascii_buffer_converter, &data, &header))
goto exit;
- return_value = binascii_a2b_qp_impl(module, &ascii, header);
+ return_value = binascii_a2b_qp_impl(module, &data, header);
exit:
return return_value;
@@ -426,4 +427,4 @@
return return_value;
}
-/*[clinic end generated code: checksum=bd769a1cd1169bfa0b73a0ee3081b0748fc39e2c]*/
+/*[clinic end generated code: checksum=abe48ca8020fa3ec25e13bd9fa7414f6b3ee2946]*/
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list