Kaydet (Commit) f2156316 authored tarafından Éric Araujo's avatar Éric Araujo

Put version* directives at the right scope

üst bc57789d
...@@ -29,6 +29,8 @@ this module. ...@@ -29,6 +29,8 @@ this module.
Hashing Methods Hashing Methods
--------------- ---------------
.. versionadded:: 3.3
The :mod:`crypt` module defines the list of hashing methods (not all methods The :mod:`crypt` module defines the list of hashing methods (not all methods
are available on all platforms): are available on all platforms):
...@@ -37,33 +39,26 @@ 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 A Modular Crypt Format method with 16 character salt and 86 character
hash. This is the strongest method. hash. This is the strongest method.
.. versionadded:: 3.3
.. data:: METHOD_SHA256 .. data:: METHOD_SHA256
Another Modular Crypt Format method with 16 character salt and 43 Another Modular Crypt Format method with 16 character salt and 43
character hash. character hash.
.. versionadded:: 3.3
.. data:: METHOD_MD5 .. data:: METHOD_MD5
Another Modular Crypt Format method with 8 character salt and 22 Another Modular Crypt Format method with 8 character salt and 22
character hash. character hash.
.. versionadded:: 3.3
.. data:: METHOD_CRYPT .. data:: METHOD_CRYPT
The traditional method with a 2 character salt and 13 characters of The traditional method with a 2 character salt and 13 characters of
hash. This is the weakest method. hash. This is the weakest method.
.. versionadded:: 3.3
Module Attributes Module Attributes
----------------- -----------------
.. versionadded:: 3.3
.. attribute:: methods .. attribute:: methods
...@@ -71,8 +66,6 @@ Module Attributes ...@@ -71,8 +66,6 @@ Module Attributes
``crypt.METHOD_*`` objects. This list is sorted from strongest to ``crypt.METHOD_*`` objects. This list is sorted from strongest to
weakest, and is guaranteed to have at least ``crypt.METHOD_CRYPT``. weakest, and is guaranteed to have at least ``crypt.METHOD_CRYPT``.
.. versionadded:: 3.3
Module Functions Module Functions
---------------- ----------------
...@@ -108,9 +101,8 @@ The :mod:`crypt` module defines the following 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 different sizes in the *salt*, it is recommended to use the full crypted
password as salt when checking for a password. password as salt when checking for a password.
.. versionchanged:: 3.3 .. versionchanged:: 3.3
Before version 3.3, *salt* must be specified as a string and cannot Accept ``crypt.METHOD_*`` values in addition to strings for *salt*.
accept ``crypt.METHOD_*`` values (which don't exist anyway).
.. function:: mksalt(method=None) .. function:: mksalt(method=None)
...@@ -124,7 +116,7 @@ The :mod:`crypt` module defines the following functions: ...@@ -124,7 +116,7 @@ The :mod:`crypt` module defines the following functions:
16 random characters from the set ``[./a-zA-Z0-9]``, suitable for 16 random characters from the set ``[./a-zA-Z0-9]``, suitable for
passing as the *salt* argument to :func:`crypt`. passing as the *salt* argument to :func:`crypt`.
.. versionadded:: 3.3 .. versionadded:: 3.3
Examples Examples
-------- --------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment