1 files changed, 17 insertions, 18 deletions
diff --git a/mediagoblin/gmg_commands/users.py b/mediagoblin/gmg_commands/users.py
index d1a8b72d..b61a5571 100644
--- a/mediagoblin/gmg_commands/users.py
+++ b/mediagoblin/gmg_commands/users.py
@@ -14,7 +14,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import print_function
 
 import sys
 
@@ -41,7 +40,7 @@ def adduser(args):
     #TODO: Lets trust admins this do not validate Emails :)
     commands_util.setup_app(args)
 
-    args.username = six.text_type(commands_util.prompt_if_not_set(args.username, "Username:"))
+    args.username = str(commands_util.prompt_if_not_set(args.username, "Username:"))
     args.password = commands_util.prompt_if_not_set(args.password, "Password:",True)
     args.email = commands_util.prompt_if_not_set(args.email, "Email:")
 
@@ -52,36 +51,36 @@ def adduser(args):
         ).count()
 
     if users_with_username:
-        print(u'Sorry, a user with that name already exists.')
+        print('Sorry, a user with that name already exists.')
         sys.exit(1)
 
     else:
         # Create the user
         entry = db.LocalUser()
-        entry.username = six.text_type(args.username.lower())
-        entry.email = six.text_type(args.email)
+        entry.username = str(args.username.lower())
+        entry.email = str(args.email)
         entry.pw_hash = auth.gen_password_hash(args.password)
         default_privileges = [
             db.Privilege.query.filter(
-                db.Privilege.privilege_name==u'commenter').one(),
+                db.Privilege.privilege_name=='commenter').one(),
             db.Privilege.query.filter(
-                db.Privilege.privilege_name==u'uploader').one(),
+                db.Privilege.privilege_name=='uploader').one(),
             db.Privilege.query.filter(
-                db.Privilege.privilege_name==u'reporter').one(),
+                db.Privilege.privilege_name=='reporter').one(),
             db.Privilege.query.filter(
-                db.Privilege.privilege_name==u'active').one()
+                db.Privilege.privilege_name=='active').one()
         ]
         entry.all_privileges = default_privileges
         entry.save()
 
-        print(u"User created (and email marked as verified).")
+        print("User created (and email marked as verified).")
 
 
 def makeadmin_parser_setup(subparser):
     subparser.add_argument(
         'username',
         help="Username to give admin level",
-        type=six.text_type)
+        type=str)
 
 
 def makeadmin(args):
@@ -95,12 +94,12 @@ def makeadmin(args):
     if user:
         user.all_privileges.append(
             db.Privilege.query.filter(
-                db.Privilege.privilege_name==u'admin').one()
+                db.Privilege.privilege_name=='admin').one()
         )
         user.save()
-        print(u'The user %s is now an admin.' % args.username)
+        print('The user %s is now an admin.' % args.username)
     else:
-        print(u'The user %s doesn\'t exist.' % args.username)
+        print('The user %s doesn\'t exist.' % args.username)
         sys.exit(1)
 
 
@@ -108,7 +107,7 @@ def changepw_parser_setup(subparser):
     subparser.add_argument(
         'username',
         help="Username used to login",
-        type=six.text_type)
+        type=str)
     subparser.add_argument(
         'password',
         help="Your NEW supersecret word to login")
@@ -125,9 +124,9 @@ def changepw(args):
     if user:
         user.pw_hash = auth.gen_password_hash(args.password)
         user.save()
-        print(u'Password successfully changed for user %s.' % args.username)
+        print('Password successfully changed for user %s.' % args.username)
     else:
-        print(u'The user %s doesn\'t exist.' % args.username)
+        print('The user %s doesn\'t exist.' % args.username)
         sys.exit(1)
 
 
@@ -135,7 +134,7 @@ def deleteuser_parser_setup(subparser):
     subparser.add_argument(
         'username',
         help="Username to delete",
-        type=six.text_type)
+        type=str)
 
 
 def deleteuser(args):