Skip to content

Rename keyring.py to keyring_utils.py #1765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yarikoptic merged 1 commit into from
Dec 11, 2025
Merged

Rename keyring.py to keyring_utils.py #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dandi/dandiapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
EmbargoStatus,
)
from .exceptions import HTTP404Error, NotFoundError, SchemaVersionError
from .keyring import keyring_lookup, keyring_save
from .keyring_utils import keyring_lookup, keyring_save
from .misctypes import Digest, RemoteReadableAsset
from .utils import (
USER_AGENT,
Expand Down
0 dandi/keyring.py → dandi/keyring_utils.py
View file
Open in desktop
File renamed without changes.
28 changes: 19 additions & 9 deletions dandi/tests/test_keyring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from .fixtures import DandiAPI
from ..dandiapi import DandiAPIClient
from ..keyring import keyring_lookup, keyringrc_file
from ..keyring_utils import keyring_lookup, keyringrc_file


@pytest.fixture(scope="module", autouse=True)
Expand Down Expand Up @@ -145,7 +145,7 @@ def test_keyring_lookup_default_no_password(
) -> None:
monkeypatch.delenv("PYTHON_KEYRING_BACKEND", raising=False)
kb0 = null.Keyring()
get_keyring = mocker.patch("dandi.keyring.get_keyring", return_value=kb0)
get_keyring = mocker.patch("dandi.keyring_utils.get_keyring", return_value=kb0)
kb, password = keyring_lookup("testservice", "testusername")
assert kb is kb0
assert password is None
Expand All @@ -159,7 +159,7 @@ def test_keyring_lookup_default_password(
monkeypatch.delenv("PYTHON_KEYRING_BACKEND", raising=False)
kb0 = keyfile.PlaintextKeyring()
kb0.set_password("testservice", "testusername", "testpassword")
get_keyring = mocker.patch("dandi.keyring.get_keyring", return_value=kb0)
get_keyring = mocker.patch("dandi.keyring_utils.get_keyring", return_value=kb0)
kb, password = keyring_lookup("testservice", "testusername")
assert kb is kb0
assert password == "testpassword"
Expand All @@ -176,7 +176,7 @@ def test_keyring_lookup_fail_default_encrypted(
) -> None:
monkeypatch.delenv("PYTHON_KEYRING_BACKEND", raising=False)
get_keyring = mocker.patch(
"dandi.keyring.get_keyring", return_value=EncryptedFailure()
"dandi.keyring_utils.get_keyring", return_value=EncryptedFailure()
)
with pytest.raises(KeyringError):
keyring_lookup("testservice", "testusername")
Expand All @@ -188,7 +188,9 @@ def test_keyring_lookup_encrypted_fallback_exists_no_password(
mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
) -> None:
monkeypatch.delenv("PYTHON_KEYRING_BACKEND", raising=False)
get_keyring = mocker.patch("dandi.keyring.get_keyring", return_value=fail.Keyring())
get_keyring = mocker.patch(
"dandi.keyring_utils.get_keyring", return_value=fail.Keyring()
)
kf = Path(keyfile.EncryptedKeyring().file_path)
kf.parent.mkdir(parents=True, exist_ok=True)
kf.touch()
Expand All @@ -203,7 +205,9 @@ def test_keyring_lookup_encrypted_fallback_exists_password(
mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
) -> None:
monkeypatch.delenv("PYTHON_KEYRING_BACKEND", raising=False)
get_keyring = mocker.patch("dandi.keyring.get_keyring", return_value=fail.Keyring())
get_keyring = mocker.patch(
"dandi.keyring_utils.get_keyring", return_value=fail.Keyring()
)
kb0 = keyfile.EncryptedKeyring()
getpass = mocker.patch("getpass.getpass", return_value="file-password")
kb0.set_password("testservice", "testusername", "testpassword")
Expand All @@ -221,7 +225,9 @@ def test_keyring_lookup_encrypted_fallback_not_exists_no_create(
mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
) -> None:
monkeypatch.delenv("PYTHON_KEYRING_BACKEND", raising=False)
get_keyring = mocker.patch("dandi.keyring.get_keyring", return_value=fail.Keyring())
get_keyring = mocker.patch(
"dandi.keyring_utils.get_keyring", return_value=fail.Keyring()
)
confirm = mocker.patch("click.confirm", return_value=False)
with pytest.raises(KeyringError):
keyring_lookup("testservice", "testusername")
Expand All @@ -236,7 +242,9 @@ def test_keyring_lookup_encrypted_fallback_not_exists_create_rcconf(
mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
) -> None:
monkeypatch.delenv("PYTHON_KEYRING_BACKEND", raising=False)
get_keyring = mocker.patch("dandi.keyring.get_keyring", return_value=fail.Keyring())
get_keyring = mocker.patch(
"dandi.keyring_utils.get_keyring", return_value=fail.Keyring()
)
confirm = mocker.patch("click.confirm", return_value=True)
kb, password = keyring_lookup("testservice", "testusername")
assert isinstance(kb, keyfile.EncryptedKeyring)
Expand All @@ -256,7 +264,9 @@ def test_keyring_lookup_encrypted_fallback_not_exists_create_rcconf_exists(
mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
) -> None:
monkeypatch.delenv("PYTHON_KEYRING_BACKEND", raising=False)
get_keyring = mocker.patch("dandi.keyring.get_keyring", return_value=fail.Keyring())
get_keyring = mocker.patch(
"dandi.keyring_utils.get_keyring", return_value=fail.Keyring()
)
confirm = mocker.patch("click.confirm", return_value=True)
rc = keyringrc_file()
rc.parent.mkdir(parents=True, exist_ok=True)
Expand Down
Loading