forked from TritonDataCenter/pkgsrc-legacy
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patch-flask_security_script.py to fix the py33 build;
also submitted upstream as TritonDataCenter#214.
- Loading branch information
kleink
committed
Jan 24, 2014
1 parent
9e7ad16
commit 27ff762
Showing
2 changed files
with
80 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
$NetBSD: distinfo,v 1.3 2014/01/15 09:20:15 kleink Exp $ | ||
$NetBSD: distinfo,v 1.4 2014/01/24 09:49:34 kleink Exp $ | ||
|
||
SHA1 (Flask-Security-1.7.1.tar.gz) = 2cfb80585b4021b79aabbe5998d4e240e37cf063 | ||
RMD160 (Flask-Security-1.7.1.tar.gz) = 99548b9853db5d5a40ff6ff543b199b6f9210a26 | ||
Size (Flask-Security-1.7.1.tar.gz) = 35202 bytes | ||
SHA1 (patch-flask_security_script.py) = b5991ce1bb272a4242c3e3b1a86b5f2e4bc3eb84 |
78 changes: 78 additions & 0 deletions
78
www/py-flask-security/patches/patch-flask_security_script.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
$NetBSD: patch-flask_security_script.py,v 1.1 2014/01/24 09:49:34 kleink Exp $ | ||
|
||
--- flask_security/script.py.orig 2013-07-22 18:36:22.000000000 +0200 | ||
+++ flask_security/script.py 2014-01-24 10:40:19.000000000 +0100 | ||
@@ -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 @@ _datastore = LocalProxy(lambda: current_ | ||
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 @@ class CreateUserCommand(Command): | ||
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(_ToggleActiv | ||
@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(_ToggleActiveC | ||
@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) |