Merge branch 'master' into fix/none_string

uc-cdis · Feb 28, 2025 · 7946daa · 7946daa
2 parents d6b5cf3 + b5f744b
commit 7946daa
Show file tree

Hide file tree

Showing 3 changed files with 311 additions and 325 deletions.
diff --git a/fence/sync/sync_users.py b/fence/sync/sync_users.py
@@ -107,7 +107,10 @@ def _read_file(filepath, encrypted=True, key=None, logger=None):
                 "-K",
                 key,
                 filepath,
-            ]
+            ],
+            stdout=sp.PIPE,
+            stderr=open(os.devnull, "w"),
+            universal_newlines=True,
         )
         try:
             yield StringIO(p.communicate()[0])
@@ -550,6 +553,7 @@ def _parse_csv(self, file_dict, sess, dbgap_config={}, encrypted=True):
                 filepath, encrypted=encrypted, key=dbgap_key, logger=self.logger
             ) as f:
                 csv = DictReader(f, quotechar='"', skipinitialspace=True)
+
                 for row in csv:
                     username = row.get("login") or ""
                     if username == "":