diff options
| author | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:18:39 -0800 |
|---|---|---|
| committer | Mariatta Wijaya <mariatta.wijaya@gmail.com> | 2017-02-06 20:18:39 -0800 |
| commit | 731cca110f376cdbaffb536e42d6c9d6da574fa8 (patch) | |
| tree | 9cb95caf6f8b933115820bf699725d9cd600d2df /Modules/clinic/_hashopenssl.c.h | |
| parent | da79bcf8ac7ae72218ab023e1ed54390bc1a3a27 (diff) | |
| parent | c8102f4d974669f4c5e4ca7bcd73292a1ac5bcbf (diff) | |
| download | cpython-731cca110f376cdbaffb536e42d6c9d6da574fa8.tar.gz | |
Issue #29371: merge with 3.6
Diffstat (limited to 'Modules/clinic/_hashopenssl.c.h')
| -rw-r--r-- | Modules/clinic/_hashopenssl.c.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/clinic/_hashopenssl.c.h b/Modules/clinic/_hashopenssl.c.h index 0445352604..572600a224 100644 --- a/Modules/clinic/_hashopenssl.c.h +++ b/Modules/clinic/_hashopenssl.c.h @@ -33,7 +33,7 @@ _hashlib_scrypt(PyObject *module, PyObject **args, Py_ssize_t nargs, PyObject *k long maxmem = 0; long dklen = 64; - if (!_PyArg_ParseStack(args, nargs, kwnames, &_parser, + if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser, &password, &salt, &PyLong_Type, &n_obj, &PyLong_Type, &r_obj, &PyLong_Type, &p_obj, &maxmem, &dklen)) { goto exit; } @@ -57,4 +57,4 @@ exit: #ifndef _HASHLIB_SCRYPT_METHODDEF #define _HASHLIB_SCRYPT_METHODDEF #endif /* !defined(_HASHLIB_SCRYPT_METHODDEF) */ -/*[clinic end generated code: output=118cd7036fa0fb52 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=71f1e033efe4ac9a input=a9049054013a1b77]*/ |