Permalink
Browse files

Merge branch 'develop' of github.com:mattupstate/flask-security into …

…develop
  • Loading branch information...
mattupstate committed Jan 24, 2014
2 parents 2e57734 + 9400032 commit d314e54680f4e21b47f14a657a5da3e895b9acbd
Showing with 10 additions and 8 deletions.
  1. +10 −8 flask_security/script.py
View
@@ -8,6 +8,8 @@
:copyright: (c) 2012 by Matt Wright.
:license: MIT, see LICENSE for more details.
"""
+from __future__ import print_function
+
try:
import simplejson as json
except ImportError:
@@ -26,7 +28,7 @@
def pprint(obj):
- print json.dumps(obj, sort_keys=True, indent=4)
+ print(json.dumps(obj, sort_keys=True, indent=4))
def commit(fn):
@@ -59,11 +61,11 @@ def run(self, **kwargs):
if form.validate():
kwargs['password'] = encrypt_password(kwargs['password'])
_datastore.create_user(**kwargs)
- print 'User created successfully.'
+ print('User created successfully.')
kwargs['password'] = '****'
pprint(kwargs)
else:
- print 'Error creating user'
+ print('Error creating user')
pprint(form.errors)
@@ -78,7 +80,7 @@ class CreateRoleCommand(Command):
@commit
def run(self, **kwargs):
_datastore.create_role(**kwargs)
- print 'Role "%(name)s" created successfully.' % kwargs
+ print('Role "%(name)s" created successfully.' % kwargs)
class _RoleCommand(Command):
@@ -94,7 +96,7 @@ class AddRoleCommand(_RoleCommand):
@commit
def run(self, user_identifier, role_name):
_datastore.add_role_to_user(user_identifier, role_name)
- print "Role '%s' added to user '%s' successfully" % (role_name, user_identifier)
+ print("Role '%s' added to user '%s' successfully" % (role_name, user_identifier))
class RemoveRoleCommand(_RoleCommand):
@@ -103,7 +105,7 @@ class RemoveRoleCommand(_RoleCommand):
@commit
def run(self, user_identifier, role_name):
_datastore.remove_role_from_user(user_identifier, role_name)
- print "Role '%s' removed from user '%s' successfully" % (role_name, user_identifier)
+ print("Role '%s' removed from user '%s' successfully" % (role_name, user_identifier))
class _ToggleActiveCommand(Command):
@@ -118,7 +120,7 @@ class DeactivateUserCommand(_ToggleActiveCommand):
@commit
def run(self, user_identifier):
_datastore.deactivate_user(user_identifier)
- print "User '%s' has been deactivated" % user_identifier
+ print("User '%s' has been deactivated" % user_identifier)
class ActivateUserCommand(_ToggleActiveCommand):
@@ -127,4 +129,4 @@ class ActivateUserCommand(_ToggleActiveCommand):
@commit
def run(self, user_identifier):
_datastore.activate_user(user_identifier)
- print "User '%s' has been activated" % user_identifier
+ print("User '%s' has been activated" % user_identifier)

0 comments on commit d314e54

Please sign in to comment.