refactor: code reorganization

ziggurat_foundations/models/services/user.py

@@ -8,6 +8,7 @@
 import six
 import sqlalchemy as sa
 
+from ziggurat_foundations.utils import generate_random_string
 from ziggurat_foundations.models.base import get_db_session
 from ziggurat_foundations.models.services import BaseService
 from ziggurat_foundations.permissions import (
@@ -253,7 +254,7 @@ def regenerate_security_code(cls, instance):
         :param instance:
         :return:
         """
-        instance.security_code = instance.generate_random_string(64)
+        instance.security_code = cls.generate_random_string(64)
 
     @staticmethod
     def generate_random_string(chars=7):
@@ -262,8 +263,7 @@ def generate_random_string(chars=7):
         :param chars:
         :return:
         """
-        return u''.join(random.sample(string.ascii_letters * 2 + string.digits,
-                                      chars))
+        return generate_random_string(chars)
 
     @classmethod
     def by_id(cls, user_id, db_session=None):

ziggurat_foundations/utils.py

@@ -2,7 +2,8 @@
 """
 Utility functions.
 """
-
+import random
+import string
 
 class PlaceholderPasswordChecker(object):
     """Match and return false on check() for '*' (a password hash
@@ -43,3 +44,13 @@ def __nonzero__(self):
 
 
 noop = NOOP()
+
+
+def generate_random_string(chars=7):
+    """
+
+    :param chars:
+    :return:
+    """
+    return u''.join(random.sample(string.ascii_letters * 2 + string.digits,
+                                  chars))