summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2017-02-17 11:21:50 -0500
committerEli Collins <elic@assurancetechnologies.com>2017-02-17 11:21:50 -0500
commit5b529f14d35c657c6d67a8fc5ee5dfaf89d5c6e3 (patch)
treecbba1a0ce1111317c8647a0396804db24b4f45f6 /admin
parentd9ebfa4a70506d47dae94c1ab1a3c40f854428d7 (diff)
downloadpasslib-5b529f14d35c657c6d67a8fc5ee5dfaf89d5c6e3.tar.gz
compat cleanup: replaced all u("") instances with u""
realized can do this now that we're requiring python3 >= 3.3. had to keep u() helper around for u(r"") instances, since py3 doesn't have ur"". but switched it to use ascii decoding for py2, to make sure things are clean.
Diffstat (limited to 'admin')
-rw-r--r--admin/benchmarks.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/admin/benchmarks.py b/admin/benchmarks.py
index f664cea..b6a5d99 100644
--- a/admin/benchmarks.py
+++ b/admin/benchmarks.py
@@ -24,7 +24,7 @@ try:
except ImportError:
PasslibConfigWarning = None
import passlib.utils.handlers as uh
-from passlib.utils.compat import u, print_, unicode
+from passlib.utils.compat import print_, unicode
from passlib.tests.utils import time_call
# local
@@ -93,12 +93,12 @@ from passlib.context import CryptContext
class BlankHandler(uh.HasRounds, uh.HasSalt, uh.GenericHandler):
name = "blank"
- ident = u("$b$")
+ ident = u"$b$"
setting_kwds = ("rounds", "salt", "salt_size")
checksum_size = 1
min_salt_size = max_salt_size = 1
- salt_chars = u("a")
+ salt_chars = u"a"
min_rounds = 1000
max_rounds = 3000
@@ -117,10 +117,10 @@ class BlankHandler(uh.HasRounds, uh.HasSalt, uh.GenericHandler):
class AnotherHandler(BlankHandler):
name = "another"
- ident = u("$a$")
+ ident = u"$a$"
-SECRET = u("toomanysecrets")
-OTHER = u("setecastronomy")
+SECRET = u"toomanysecrets"
+OTHER = u"setecastronomy"
#=============================================================================
# CryptContext benchmarks