Avoid logging warning with no config file is present. Fixes #635.

jaraco · Jun 23, 2023 · c1e291b · c1e291b
1 parent 560eca8
commit c1e291b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/keyring/core.py b/keyring/core.py
@@ -150,12 +150,17 @@ def _config_path():
     return platform.config_root() / 'keyringrc.cfg'
 
 
+def _ensure_path(path):
+    if not path.exists():
+        raise FileNotFoundError(path)
+
+
 def load_config() -> typing.Optional[backend.KeyringBackend]:
     """Load a keyring using the config file in the config root."""
 
     config = configparser.RawConfigParser()
     try:
-        config.read(_config_path(), encoding='utf-8')
+        config.read(_ensure_path(_config_path()), encoding='utf-8')
     except FileNotFoundError:
         return None
     _load_keyring_path(config)

diff --git a/newsfragments/635.bugfix.rst b/newsfragments/635.bugfix.rst
@@ -0,0 +1 @@
+Avoid logging warning when no config file is present.
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -1,5 +1,3 @@
-import pytest
-
 import keyring.core
 
 
@@ -11,7 +9,6 @@ def test_init_recommended(monkeypatch):
     keyring.core.init_backend(keyring.core.recommended)
 
 
-@pytest.mark.xfail(reason="#635")
 def test_load_config_missing(caplog):
     assert keyring.core.load_config() is None
     assert not caplog.records