refactor: use util.ensure_text instead of six.ensure_text

Signed-off-by: Martin Styk <mart.styk@gmail.com>

Author: StykMartin

Server/bkr/server/model/identity.py

@@ -26,7 +26,7 @@
 from formencode import validators
 from formencode.api import Invalid
 from bkr.server.bexceptions import BX, NoChangeException
-from bkr.server.util import convert_db_lookup_error, ensure_str
+from bkr.server.util import convert_db_lookup_error, ensure_str, ensure_text
 from bkr.server import identity
 from bkr.server.hybrid import hybrid_method, hybrid_property
 from .base import DeclarativeMappedObject
@@ -371,7 +371,7 @@ def can_edit_keystone_trust(self, user):
     )
 
     def _set_password(self, raw_password):
-        self._password = six.ensure_text(self._password_context.encrypt(raw_password))
+        self._password = ensure_text(self._password_context.encrypt(raw_password))
 
     def _get_password(self):
         return self._password

Server/bkr/server/tools/init.py

@@ -15,7 +15,6 @@
 import datetime
 import re
 import logging
-import six
 from sqlalchemy.inspection import inspect
 from sqlalchemy.exc import InvalidRequestError
 from sqlalchemy.orm import create_session
@@ -25,7 +24,7 @@
 from bkr.server.model import (User, Group, Permission, Hypervisor, KernelType,
                               Arch, PowerType, Key, RetentionTag, ConfigItem, UserGroup,
                               DataMigration)
-from bkr.server.util import load_config_or_exit, log_traceback
+from bkr.server.util import load_config_or_exit, log_traceback, ensure_text
 from bkr.server.database import session, metadata as tg_metadata
 from optparse import OptionParser
 import alembic.config, alembic.script, alembic.environment
@@ -107,13 +106,13 @@ def populate_db(user_name=None, password=None, user_display_name=None,
 
     # Setup User account
     if user_name:
-        user = User.lazy_create(user_name=six.ensure_text(user_name))
+        user = User.lazy_create(user_name=ensure_text(user_name))
         if password:
-            user.password = six.ensure_text(password)
+            user.password = ensure_text(password)
         if user_display_name:
-            user.display_name = six.ensure_text(user_display_name)
+            user.display_name = ensure_text(user_display_name)
         if user_email_address:
-            user.email_address = six.ensure_text(user_email_address)
+            user.email_address = ensure_text(user_email_address)
         # Ensure the user is in the 'admin' group as an owner.
         # Flush for lazy_create.
         session.flush()

Server/bkr/server/util.py

@@ -123,6 +123,13 @@ def ensure_str(s, encoding='utf-8', errors='strict'):
         raise TypeError("not expecting type '%s'" % type(s))
     return s
 
+def ensure_text(s, encoding='utf-8', errors='strict'):
+    if isinstance(s, six.binary_type):
+        return s.decode(encoding, errors)
+    elif isinstance(s, six.text_type):
+        return s
+    raise TypeError("not expecting type '%s'" % type(s))
+
 def _query_arg(value):
     if six.PY2 and isinstance(value, six.text_type):
         return value.encode('utf-8')