diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-12-24 07:44:03 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-12-24 07:44:03 (GMT) |
| commit | 520569e9bd9cff593f53ba3ffcbe251efd2b2344 (patch) | |
| tree | 816e606c0b42b12313ec64170b79ee87583dc5f3 | |
| parent | 3a72ee5b5a8d80bc63ba173e1fd689eab3bc3c57 (diff) | |
| parent | 3310e146cc54e7b4e76641c57272ba6c12367876 (diff) | |
| download | cpython-520569e9bd9cff593f53ba3ffcbe251efd2b2344.zip cpython-520569e9bd9cff593f53ba3ffcbe251efd2b2344.tar.gz cpython-520569e9bd9cff593f53ba3ffcbe251efd2b2344.tar.bz2 | |
Issue #29004: Merge crc_hqx() doc from 3.5
| -rw-r--r-- | Doc/library/binascii.rst | 6 | ||||
| -rw-r--r-- | Modules/binascii.c | 4 | ||||
| -rw-r--r-- | Modules/clinic/binascii.c.h | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Doc/library/binascii.rst b/Doc/library/binascii.rst index 4f5f0f2..0476f50 100644 --- a/Doc/library/binascii.rst +++ b/Doc/library/binascii.rst @@ -116,8 +116,10 @@ The :mod:`binascii` module defines the following functions: .. function:: crc_hqx(data, value) - Compute the binhex4 crc value of *data*, starting with *value* as the - initial crc, and return the result. + Compute a 16-bit CRC value of *data*, starting with *value* as the + initial CRC, and return the result. This uses the CRC-CCITT polynomial + *x*:sup:`16` + *x*:sup:`12` + *x*:sup:`5` + 1, often represented as + 0x1021. This CRC is used in the binhex4 format. .. function:: crc32(data[, value]) diff --git a/Modules/binascii.c b/Modules/binascii.c index 9b9cd7f..ee66a48 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 acafcbf..743bf46 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]*/ |