summaryrefslogtreecommitdiff
path: root/docs/lib
diff options
context:
space:
mode:
Diffstat (limited to 'docs/lib')
-rw-r--r--docs/lib/passlib.apache.rst4
-rw-r--r--docs/lib/passlib.context.rst36
-rw-r--r--docs/lib/passlib.hash.bcrypt.rst7
-rw-r--r--docs/lib/passlib.hash.unix_disabled.rst4
-rw-r--r--docs/lib/passlib.utils.pbkdf2.rst2
5 files changed, 4 insertions, 49 deletions
diff --git a/docs/lib/passlib.apache.rst b/docs/lib/passlib.apache.rst
index b87eb63..969ead0 100644
--- a/docs/lib/passlib.apache.rst
+++ b/docs/lib/passlib.apache.rst
@@ -19,6 +19,10 @@ htpasswd and htdigest files; though the use of two helper classes.
These classes will now preserve blank lines and "#" comments when updating
htpasswd files; previous releases would throw a parse error.
+.. versionchanged:: 1.8
+
+ A number of methods deprecated since 1.6, have been removed.
+
.. index:: Apache; htpasswd
Htpasswd Files
diff --git a/docs/lib/passlib.context.rst b/docs/lib/passlib.context.rst
index 5ed7413..bec6f7e 100644
--- a/docs/lib/passlib.context.rst
+++ b/docs/lib/passlib.context.rst
@@ -166,36 +166,6 @@ Options which directly affect the behavior of the CryptContext instance:
.. versionadded:: 1.7
-.. _context-min-verify-time-option:
-
-``min_verify_time``
-
- If specified, unsuccessful :meth:`~CryptContext.verify`
- calls will be penalized, and take at least this may
- seconds before the method returns. May be an integer
- or fractional number of seconds.
-
- .. deprecated:: 1.6
- This option has not proved very useful, is ignored by 1.7,
- and will be removed in version 1.8.
-
- .. versionchanged:: 1.7
-
- Per deprecation roadmap above, this option is now ignored.
-
-.. _context-harden-verify-option:
-
-``harden_verify``
-
- Companion to ``min_verify_time``, currently ignored.
-
- .. versionadded:: 1.7
-
- .. deprecated:: 1.7.1
-
- This option is ignored by 1.7.1, and will be removed in 1.8
- along with ``min_verify_time``.
-
.. _context-algorithm-options:
Algorithm Options
@@ -537,9 +507,3 @@ if any invalid-but-correctable values are encountered
Other Helpers
=============
.. autoclass:: LazyCryptContext([schemes=None,] \*\*kwds [, onload=None])
-
-.. rst-class:: html-toggle
-
-The CryptPolicy Class (deprecated)
-==================================
-.. autoclass:: CryptPolicy
diff --git a/docs/lib/passlib.hash.bcrypt.rst b/docs/lib/passlib.hash.bcrypt.rst
index 436148c..3bb5865 100644
--- a/docs/lib/passlib.hash.bcrypt.rst
+++ b/docs/lib/passlib.hash.bcrypt.rst
@@ -50,17 +50,10 @@ Bcrypt Backends
.. rst-class:: float-center
-.. warning::
-
- Support for ``py-bcrypt`` and ``bcryptor`` will be dropped in Passlib 1.8,
- as these libraries are unmaintained.
-
This class will use the first available of five possible backends:
1. `bcrypt <https://pypi.python.org/pypi/bcrypt>`_, if installed.
-2. `py-bcrypt <https://pypi.python.org/pypi/py-bcrypt>`_, if installed (DEPRECATED)
-3. `bcryptor <https://bitbucket.org/ares/bcryptor/overview>`_, if installed (DEPRECATED).
4. stdlib's :func:`crypt.crypt()`, if the host OS supports BCrypt
(primarily BSD-derived systems).
5. A pure-python implementation of BCrypt, built into Passlib.
diff --git a/docs/lib/passlib.hash.unix_disabled.rst b/docs/lib/passlib.hash.unix_disabled.rst
index 8bdf9c3..2c68144 100644
--- a/docs/lib/passlib.hash.unix_disabled.rst
+++ b/docs/lib/passlib.hash.unix_disabled.rst
@@ -36,10 +36,6 @@ Interface
=========
.. autoclass:: unix_disabled()
-Deprecated Interface
-====================
-.. autoclass:: unix_fallback()
-
Deviations
==========
According to the Linux ``shadow`` man page, an empty string is treated
diff --git a/docs/lib/passlib.utils.pbkdf2.rst b/docs/lib/passlib.utils.pbkdf2.rst
index cfc503a..a72628a 100644
--- a/docs/lib/passlib.utils.pbkdf2.rst
+++ b/docs/lib/passlib.utils.pbkdf2.rst
@@ -32,6 +32,4 @@ PKCS#5 Key Derivation Functions
Helper Functions
================
-.. autofunction:: norm_hash_name
-
.. autofunction:: get_prf