summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-12-24 07:45:56 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-12-24 07:45:56 +0000
commitd53f0c587418e7431b133575d369955063ea5bf7 (patch)
tree88097f39367e4b8835f51a205095059bd3097885 /Modules
parent604a6e2855a1bb629f95a17324c520f79eecc804 (diff)
parent66e4b84316a8d32389ba9cecf4550d1745d3a9a9 (diff)
downloadcpython-d53f0c587418e7431b133575d369955063ea5bf7.tar.gz
Issue #29004: Merge crc_hqx() doc from 3.6
Diffstat (limited to 'Modules')
-rw-r--r--Modules/binascii.c4
-rw-r--r--Modules/clinic/binascii.c.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/Modules/binascii.c b/Modules/binascii.c
index 9b9cd7f011..ee66a48ebc 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -900,12 +900,12 @@ binascii.crc_hqx -> unsigned_int
crc: unsigned_int(bitwise=True)
/
-Compute hqx CRC incrementally.
+Compute CRC-CCITT incrementally.
[clinic start generated code]*/
static unsigned int
binascii_crc_hqx_impl(PyObject *module, Py_buffer *data, unsigned int crc)
-/*[clinic end generated code: output=8ec2a78590d19170 input=add8c53712ccceda]*/
+/*[clinic end generated code: output=8ec2a78590d19170 input=f18240ff8c705b79]*/
{
const unsigned char *bin_data;
Py_ssize_t len;
diff --git a/Modules/clinic/binascii.c.h b/Modules/clinic/binascii.c.h
index acafcbf701..743bf46ea8 100644
--- a/Modules/clinic/binascii.c.h
+++ b/Modules/clinic/binascii.c.h
@@ -263,7 +263,7 @@ PyDoc_STRVAR(binascii_crc_hqx__doc__,
"crc_hqx($module, data, crc, /)\n"
"--\n"
"\n"
-"Compute hqx CRC incrementally.");
+"Compute CRC-CCITT incrementally.");
#define BINASCII_CRC_HQX_METHODDEF \
{"crc_hqx", (PyCFunction)binascii_crc_hqx, METH_VARARGS, binascii_crc_hqx__doc__},
@@ -550,4 +550,4 @@ exit:
return return_value;
}
-/*[clinic end generated code: output=1f8d6e48f75f6d1e input=a9049054013a1b77]*/
+/*[clinic end generated code: output=458eb09731cb7877 input=a9049054013a1b77]*/