fix generate_token (#1531)

autobahn/_version.py

@@ -24,6 +24,6 @@
 #
 ###############################################################################
 
-__version__ = '22.2.2'
+__version__ = '22.3.1.dev1'
 
-__build__ = u'00000000-0000000'
+__build__ = '00000000-0000000'

autobahn/test/test_util.py

@@ -28,7 +28,7 @@
 import unittest
 from binascii import b2a_hex
 
-from autobahn.util import IdGenerator, parse_activation_code, generate_activation_code
+from autobahn.util import IdGenerator, parse_activation_code, generate_activation_code, generate_token
 
 
 class TestIdGenerator(unittest.TestCase):
@@ -58,3 +58,10 @@ def test_parse_invalid_activation_codes(self):
             code = b2a_hex(os.urandom(20)).decode()
             parsed_code = parse_activation_code(code)
             self.assertEqual(None, parsed_code)
+
+    def test_generate_token(self):
+        token = generate_token(5, 4)
+        self.assertEqual(len(token), len('NUAG-UPQJ-MFGA-K5P5-MUGA'))
+        self.assertEqual(len(token.split('-')), 5)
+        for part in token.split('-'):
+            self.assertEqual(len(part), 4)

autobahn/util.py

@@ -358,9 +358,9 @@ def newid(length=16):
 @public
 def generate_token(char_groups: int,
                    chars_per_group: int,
-                   chars=Optional[str],
-                   sep=Optional[str],
-                   lower_case=False) -> str:
+                   chars: Optional[str] = None,
+                   sep: Optional[str] = None,
+                   lower_case: Optional[bool] = False) -> str:
     """
     Generate cryptographically strong tokens, which are strings like `M6X5-YO5W-T5IK`.
     These can be used e.g. for used-only-once activation tokens or the like.
@@ -400,7 +400,7 @@ def generate_token(char_groups: int,
     """
     assert(type(char_groups) == int)
     assert(type(chars_per_group) == int)
-    assert(chars is None or type(chars) == str)
+    assert(chars is None or type(chars) == str), 'chars must be str, was {}'.format(type(chars))
     chars = chars or DEFAULT_TOKEN_CHARS
     if lower_case:
         chars = chars.lower()