summaryrefslogtreecommitdiff
path: root/passlib/crypto/scrypt/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'passlib/crypto/scrypt/__init__.py')
-rw-r--r--passlib/crypto/scrypt/__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/passlib/crypto/scrypt/__init__.py b/passlib/crypto/scrypt/__init__.py
index c71873a..cd10632 100644
--- a/passlib/crypto/scrypt/__init__.py
+++ b/passlib/crypto/scrypt/__init__.py
@@ -6,7 +6,6 @@ XXX: add this module to public docs?
#==========================================================================
# imports
#==========================================================================
-from __future__ import absolute_import
# core
import logging; log = logging.getLogger(__name__)
from warnings import warn
@@ -108,10 +107,10 @@ def scrypt(secret, salt, n, r, p=1, keylen=32):
"""run SCrypt key derivation function using specified parameters.
:arg secret:
- passphrase string (unicode is encoded to bytes using utf-8).
+ passphrase string (str is encoded to bytes using utf-8).
:arg salt:
- salt string (unicode is encoded to bytes using utf-8).
+ salt string (str is encoded to bytes using utf-8).
:arg n:
integer 'N' parameter