Skip to content

Commit

Permalink
doc string + comment fix
Browse files Browse the repository at this point in the history
  • Loading branch information
BinamB committed Jul 12, 2022
1 parent c480e0c commit d99ceca
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion fence/sync/sync_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ def _match_pattern(filepath, id_patterns, encrypted=True):
pattern += "$"
pattern = pattern.encode().decode(
"unicode_escape"
) # when converting from yaml, python reads it as Python string literal. So "\" turns into "\\" which messes with the regex match
) # when converting the YAML from fence-config, python reads it as Python string literal. So "\" turns into "\\" which messes with the regex match
if re.match(pattern, os.path.basename(filepath)):
return True
return False
Expand Down Expand Up @@ -1263,7 +1263,17 @@ def _get_user_permissions_from_csv_list(
def _merge_multiple_local_csv_files(
self, dbgap_file_list, encrypted, dbgap_configs, session
):
"""
Args:
dbgap_file_list (list): a list of whitelist file locations stored locally
encrypted (bool): whether the file is encrypted (comes from fence config)
dbgap_configs (list): list of dictionaries containing information about the dbgap server (comes from fence config)
session (sqlalchemy.Session): database session
Return:
merged_user_projects (dict)
merged_user_info (dict)
"""
merged_user_projects = {}
merged_user_info = {}

Expand Down

0 comments on commit d99ceca

Please sign in to comment.