fix for hs_api_key not picked up from .hscfg

h5pyd/_hl/config.py

@@ -42,7 +42,8 @@ def __init__(self, config_file=None, **kwargs):
                         continue
                     k = line[:index].strip()
                     v = line[(index+1):].strip()
-                    self._cfg[k] = v
+                    if v and v.upper() != "NONE":
+                        self._cfg[k] = v
         # override any config values with environment variable if found
         for k in self._cfg.keys():
             if k.upper() in os.environ:

h5pyd/_hl/files.py

@@ -201,6 +201,9 @@ def __init__(self, domain, mode=None, endpoint=None, username=None, password=Non
                     password = os.environ["H5SERV_PASSWORD"]
                 elif "hs_password" in cfg:
                     password = cfg["hs_password"]
+
+            if api_key is None and "hs_api_key" in cfg:
+                api_key = cfg["hs_api_key"]
 
             if bucket is None:
                 if "HS_BUCKET" in os.environ:
@@ -329,7 +332,6 @@ def __init__(self, domain, mode=None, endpoint=None, username=None, password=Non
         self._lastScan = None  # when summary stats where last updated by server
         self._dn_ids = dn_ids
 
-
         Group.__init__(self, self._id)
 
     def _getVerboseInfo(self):

h5pyd/_hl/folders.py

@@ -133,6 +133,9 @@ def __init__(self, domain_name, pattern=None, query=None, mode=None, endpoint=No
         if password is None and "hs_password" in cfg:
             password = cfg["hs_password"]
 
+        if api_key is None and "hs_api_key" in cfg:
+            api_key = cfg["hs_api_key"]
+
         if bucket is None and "hs_bucket" in cfg:
             bucket = cfg["hs_bucket"]