From: Ville Skyttä <ville.skytta@iki.fi>
Date: Tue, 11 Sep 2018 01:07:19 +0000 (+0300)
Subject: Use bytes.hex instead of binascii.hexlify in pbkdf2_hmac example (GH-8420)
X-Git-Tag: v3.8.0a1~1066
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=959625b5a56545f1908a7002fe11eb4f0411b780;p=thirdparty%2FPython%2Fcpython.git

Use bytes.hex instead of binascii.hexlify in pbkdf2_hmac example (GH-8420)
---

diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index baf6b0af242c..4a8d7058c68f 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -244,10 +244,10 @@ include a `salt <https://en.wikipedia.org/wiki/Salt_%28cryptography%29>`_.
    *dklen* is the length of the derived key. If *dklen* is ``None`` then the
    digest size of the hash algorithm *hash_name* is used, e.g. 64 for SHA-512.
 
-   >>> import hashlib, binascii
+   >>> import hashlib
    >>> dk = hashlib.pbkdf2_hmac('sha256', b'password', b'salt', 100000)
-   >>> binascii.hexlify(dk)
-   b'0394a2ede332c9a13eb82e9b24631604c31df978b4e2f0fbd2c549944f9d79a5'
+   >>> dk.hex()
+   '0394a2ede332c9a13eb82e9b24631604c31df978b4e2f0fbd2c549944f9d79a5'
 
    .. versionadded:: 3.4