summaryrefslogtreecommitdiff
path: root/passlib/ext
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2016-11-28 13:05:30 -0500
committerEli Collins <elic@assurancetechnologies.com>2016-11-28 13:05:30 -0500
commit2b4b86a81a5b9845a92fab89e804d428a3d6da99 (patch)
treef79b2dedd8e943e4f1f14d418e110a0f8892ffed /passlib/ext
parent59a6a2bdc1ff24abacdca74967ebd75a23aa9fc2 (diff)
downloadpasslib-2b4b86a81a5b9845a92fab89e804d428a3d6da99.tar.gz
general: went ahead and removed a bunch of deprecated features that were scheduled
for removal in v1.8. this removes CryptPolicy, unix_fallback, some old HtpasswdFile methods, and more. tests were updated as well. see history/1.8 for a complete list.
Diffstat (limited to 'passlib/ext')
-rw-r--r--passlib/ext/django/utils.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/passlib/ext/django/utils.py b/passlib/ext/django/utils.py
index a83cb89..96daa68 100644
--- a/passlib/ext/django/utils.py
+++ b/passlib/ext/django/utils.py
@@ -778,13 +778,7 @@ class DjangoContextAdapter(DjangoTranslator):
config = getattr(settings, "PASSLIB_CONTEXT", _UNSET)
if config is _UNSET:
config = "passlib-default"
- if config is None:
- warn("setting PASSLIB_CONFIG=None is deprecated, "
- "and support will be removed in Passlib 1.8, "
- "use PASSLIB_CONFIG='disabled' instead.",
- DeprecationWarning)
- config = "disabled"
- elif not isinstance(config, (unicode, bytes, dict)):
+ if not isinstance(config, (unicode, bytes, dict)):
raise exc.ExpectedTypeError(config, "str or dict", "PASSLIB_CONFIG")
# load custom category func (if any)