diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-05-29 01:27:48 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-05-29 01:27:48 (GMT) |
| commit | f21563160e66069bac9c82186e17cfba7058ec52 (patch) | |
| tree | 1c322d4d8c8520ffcaa4a0cec6cd3af917bc2095 /Doc/library/crypt.rst | |
| parent | bc57789dafaadd3652b7f02a2b17684b6c74055e (diff) | |
| download | cpython-f21563160e66069bac9c82186e17cfba7058ec52.zip cpython-f21563160e66069bac9c82186e17cfba7058ec52.tar.gz cpython-f21563160e66069bac9c82186e17cfba7058ec52.tar.bz2 | |
Put version* directives at the right scope
Diffstat (limited to 'Doc/library/crypt.rst')
| -rw-r--r-- | Doc/library/crypt.rst | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/Doc/library/crypt.rst b/Doc/library/crypt.rst index 27236c1..1ba2ed3 100644 --- a/Doc/library/crypt.rst +++ b/Doc/library/crypt.rst @@ -29,6 +29,8 @@ this module. Hashing Methods --------------- +.. versionadded:: 3.3 + The :mod:`crypt` module defines the list of hashing methods (not all methods are available on all platforms): @@ -37,33 +39,26 @@ are available on all platforms): A Modular Crypt Format method with 16 character salt and 86 character hash. This is the strongest method. - .. versionadded:: 3.3 - .. data:: METHOD_SHA256 Another Modular Crypt Format method with 16 character salt and 43 character hash. - .. versionadded:: 3.3 - .. data:: METHOD_MD5 Another Modular Crypt Format method with 8 character salt and 22 character hash. - .. versionadded:: 3.3 - .. data:: METHOD_CRYPT The traditional method with a 2 character salt and 13 characters of hash. This is the weakest method. - .. versionadded:: 3.3 - Module Attributes ----------------- +.. versionadded:: 3.3 .. attribute:: methods @@ -71,8 +66,6 @@ Module Attributes ``crypt.METHOD_*`` objects. This list is sorted from strongest to weakest, and is guaranteed to have at least ``crypt.METHOD_CRYPT``. - .. versionadded:: 3.3 - Module Functions ---------------- @@ -108,9 +101,8 @@ The :mod:`crypt` module defines the following functions: different sizes in the *salt*, it is recommended to use the full crypted password as salt when checking for a password. -.. versionchanged:: 3.3 - Before version 3.3, *salt* must be specified as a string and cannot - accept ``crypt.METHOD_*`` values (which don't exist anyway). + .. versionchanged:: 3.3 + Accept ``crypt.METHOD_*`` values in addition to strings for *salt*. .. function:: mksalt(method=None) @@ -124,7 +116,7 @@ The :mod:`crypt` module defines the following functions: 16 random characters from the set ``[./a-zA-Z0-9]``, suitable for passing as the *salt* argument to :func:`crypt`. -.. versionadded:: 3.3 + .. versionadded:: 3.3 Examples -------- |