verson 20200502.2

web2py · May 3, 2020 · 0f06016 · 0f06016
1 parent bc2255d
commit 0f06016
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pydal/__init__.py b/pydal/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "20200502.1"
+__version__ = "20200502.2"
 
 from .base import DAL
 from .objects import Field

diff --git a/pydal/validators.py b/pydal/validators.py
@@ -4455,7 +4455,7 @@ def validate(self, value, record_id=None):
 numberset = frozenset(b"0123456789")
 sym1set = frozenset(b"!@#$%^&*() ")
 sym2set = frozenset(b"~`-_=+[]{}\\|;:'\",.<>?/")
-otherset = frozenset(b"".join(chr(x) if PY2 else chr(r).encode() for x in range(256)))
+otherset = frozenset(b"".join(chr(x) if PY2 else chr(x).encode() for x in range(256)))
 
 
 def calc_entropy(string):
@@ -4515,7 +4515,7 @@ class IS_STRONG(Validator):
         >>> IS_STRONG(es=True, entropy=100)('a1d')
         ('a1d', 'Password too simple (15.97/100)')
         >>> IS_STRONG(es=True, entropy=100)('añd')
-        ('a\\xc3\\xb1d', 'Password too simple (18.13/100)')
+        ('a\\xc3\\xb1d', 'Password too simple (31.26/10)')
 
     """
 

diff --git a/tests/validators.py b/tests/validators.py
@@ -1058,10 +1058,10 @@ def test_IS_STRONG(self):
         rtn = IS_STRONG(es=True, entropy=100)("añd")
         if PY2:
             self.assertEqual(
-                rtn, ("a\xc3\xb1d", "Password too simple (18.13/100)")
+                rtn, ("a\xc3\xb1d", "Password too simple (32.66/100)")
             )
         else:
-            self.assertEqual(rtn, ("añd", "Password too simple (18.13/100)"))
+            self.assertEqual(rtn, ("añd", "Password too simple (31.26/10)"))
         rtn = IS_STRONG()("********")
         self.assertEqual(rtn, ("********", None))
         rtn = IS_STRONG(es=True, max=4)("abcde")