Merge pull request #619 from jmlrt/fix-attribute-error

[python] fix AttributeError + format code with black
This commit is contained in:
Julien Mailleret 2019-10-04 16:32:20 +02:00 committed by GitHub
commit 3e9e7be7b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,11 +1,12 @@
__author__ = 'dale mcdiarmid' __author__ = "dale mcdiarmid"
import re import re
import os.path import os.path
from six import string_types from six import string_types
def modify_list(values=[], pattern='', replacement='', ignorecase=False):
''' Perform a `re.sub` on every item in the list''' def modify_list(values=[], pattern="", replacement="", ignorecase=False):
""" Perform a `re.sub` on every item in the list"""
if ignorecase: if ignorecase:
flags = re.I flags = re.I
else: else:
@ -13,45 +14,62 @@ def modify_list(values=[], pattern='', replacement='', ignorecase=False):
_re = re.compile(pattern, flags=flags) _re = re.compile(pattern, flags=flags)
return [_re.sub(replacement, value) for value in values] return [_re.sub(replacement, value) for value in values]
def append_to_list(values=[], suffix=''):
if isinstance(values, string_types):
values = values.split(',')
return [str(value+suffix) for value in values]
def array_to_str(values=[],separator=','): def append_to_list(values=[], suffix=""):
if isinstance(values, string_types):
values = values.split(",")
return [str(value + suffix) for value in values]
def array_to_str(values=[], separator=","):
return separator.join(values) return separator.join(values)
def extract_role_users(users={},exclude_users=[]):
role_users=[] def extract_role_users(users={}, exclude_users=[]):
for user,details in users.iteritems(): role_users = []
for user, details in users.items():
if user not in exclude_users and "roles" in details: if user not in exclude_users and "roles" in details:
for role in details["roles"]: for role in details["roles"]:
role_users.append(role+":"+user) role_users.append(role + ":" + user)
return role_users return role_users
def filename(filename=''):
def filename(filename=""):
return os.path.splitext(os.path.basename(filename))[0] return os.path.splitext(os.path.basename(filename))[0]
def remove_reserved(user_roles={}): def remove_reserved(user_roles={}):
not_reserved = [] not_reserved = []
for user_role,details in user_roles.items(): for user_role, details in user_roles.items():
if not "metadata" in details or not "_reserved" in details["metadata"] or not details["metadata"]["_reserved"]: if (
not "metadata" in details
or not "_reserved" in details["metadata"]
or not details["metadata"]["_reserved"]
):
not_reserved.append(user_role) not_reserved.append(user_role)
return not_reserved return not_reserved
def filter_reserved(users_role={}): def filter_reserved(users_role={}):
reserved = [] reserved = []
for user_role,details in users_role.items(): for user_role, details in users_role.items():
if "metadata" in details and "_reserved" in details["metadata"] and details["metadata"]["_reserved"]: if (
"metadata" in details
and "_reserved" in details["metadata"]
and details["metadata"]["_reserved"]
):
reserved.append(user_role) reserved.append(user_role)
return reserved return reserved
class FilterModule(object): class FilterModule(object):
def filters(self): def filters(self):
return {'modify_list': modify_list, return {
'append_to_list':append_to_list, "modify_list": modify_list,
'filter_reserved':filter_reserved, "append_to_list": append_to_list,
'array_to_str':array_to_str, "filter_reserved": filter_reserved,
'extract_role_users':extract_role_users, "array_to_str": array_to_str,
'remove_reserved':remove_reserved, "extract_role_users": extract_role_users,
'filename':filename} "remove_reserved": remove_reserved,
"filename": filename,
}