cubicweb/server/__init__.py
changeset 12567 26744ad37953
parent 12023 0d2b889c85d3
child 12716 f5300acd8f4f
--- a/cubicweb/server/__init__.py	Fri Apr 05 17:21:14 2019 +0200
+++ b/cubicweb/server/__init__.py	Fri Apr 05 17:58:19 2019 +0200
@@ -20,13 +20,8 @@
 
 The server module contains functions to initialize a new repository.
 """
-from __future__ import print_function
-
 from contextlib import contextmanager
 
-from six import text_type, string_types
-from six.moves import filter
-
 from logilab.common.modutils import LazyObject
 from logilab.common.textutils import splitstrip
 from logilab.common.registry import yes
@@ -133,7 +128,7 @@
     if not debugmode:
         DEBUG = 0
         return
-    if isinstance(debugmode, string_types):
+    if isinstance(debugmode, str):
         for mode in splitstrip(debugmode, sep='|'):
             DEBUG |= globals()[mode]
     else:
@@ -192,7 +187,7 @@
     user = session.create_entity('CWUser', login=login, upassword=pwd)
     for group in groups:
         session.execute('SET U in_group G WHERE U eid %(u)s, G name %(group)s',
-                        {'u': user.eid, 'group': text_type(group)})
+                        {'u': user.eid, 'group': group})
     return user
 
 
@@ -270,17 +265,17 @@
         # insert base groups and default admin
         print('-> inserting default user and default groups.')
         try:
-            login = text_type(sourcescfg['admin']['login'])
+            login = sourcescfg['admin']['login']
             pwd = sourcescfg['admin']['password']
         except KeyError:
             if interactive:
                 msg = 'enter login and password of the initial manager account'
                 login, pwd = manager_userpasswd(msg=msg, confirm=True)
             else:
-                login, pwd = text_type(source['db-user']), source['db-password']
+                login, pwd = source['db-user'], source['db-password']
         # sort for eid predicatability as expected in some server tests
         for group in sorted(BASE_GROUPS):
-            cnx.create_entity('CWGroup', name=text_type(group))
+            cnx.create_entity('CWGroup', name=group)
         admin = create_user(cnx, login, pwd, u'managers')
         cnx.execute('SET X owned_by U WHERE X is IN (CWGroup,CWSource), U eid %(u)s',
                     {'u': admin.eid})