cpython: 52db2072e88b (original) (raw)

Mercurial > cpython

changeset 105802:52db2072e88b 3.6

Issue #29004: Merge crc_hqx() doc from 3.5 [#29004]

Martin Panter vadmium+py@gmail.com
date	Sat, 24 Dec 2016 07:44:03 +0000
parents	d70fcf1866ad(current diff)a33472f8a2c6(diff)
children	3af3702b2f0a 031af2160094
files	Doc/library/binascii.rst Modules/binascii.c Modules/clinic/binascii.c.h
diffstat	3 files changed, 8 insertions(+), 6 deletions(-)[+] [-] Doc/library/binascii.rst 6 Modules/binascii.c 4 Modules/clinic/binascii.c.h 4

line wrap: on

line diff

--- a/Doc/library/binascii.rst +++ b/Doc/library/binascii.rst @@ -116,8 +116,10 @@ The :mod:binascii module defines the f .. 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])

--- 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;

--- 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 [](#l3.10) {"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]/