diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2012-04-17 23:14:51 -0400 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2012-04-17 23:14:51 -0400 |
| commit | 64ab6fc89b497efa9169f11d55251e417c4db0ba (patch) | |
| tree | b3f6f5dc27b87a6bc90cb3686fa98239ee8ff053 /passlib/ext/django | |
| parent | 8eb4c4d3b58eec6802c698ddbf357b2fd243a68c (diff) | |
| parent | cd029846fdc0c3d7ffc7f53caad4579e7e0e8725 (diff) | |
| download | passlib-ironpython-support-dev.tar.gz | |
Merge from defaultironpython-support-dev
Diffstat (limited to 'passlib/ext/django')
| -rw-r--r-- | passlib/ext/django/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/passlib/ext/django/models.py b/passlib/ext/django/models.py index d76cc9c..0bf9b99 100644 --- a/passlib/ext/django/models.py +++ b/passlib/ext/django/models.py @@ -13,7 +13,7 @@ see the Passlib documentation for details on how to use this app #site from django.conf import settings #pkg -from passlib.context import CryptContext, CryptPolicy +from passlib.context import CryptContext from passlib.utils import is_crypt_context from passlib.utils.compat import bytes, unicode, base_string_types from passlib.ext.django.utils import DEFAULT_CTX, get_category, \ @@ -35,7 +35,7 @@ def patch(): if ctx == "passlib-default": ctx = DEFAULT_CTX if isinstance(ctx, base_string_types): - ctx = CryptContext(policy=CryptPolicy.from_string(ctx)) + ctx = CryptContext.from_string(ctx) if not is_crypt_context(ctx): raise TypeError("django settings.PASSLIB_CONTEXT must be CryptContext " "instance or configuration string: %r" % (ctx,)) |