Skip to content

refactor: remove joinedload of User #13784

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
merged 3 commits into from
May 26, 2023
Merged

refactor: remove joinedload of User #13784

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6144003
refactor: remove joinedload of User
miketheman May 26, 2023
0e1c8e2
refactor: use built-ins over try/except
miketheman May 26, 2023
b5cdac2
Merge branch 'main' into miketheman/simplify-macaroon-finder
ewdurbin May 26, 2023
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
17 changes: 6 additions & 11 deletions warehouse/macaroons/services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import pymacaroons

from pymacaroons.exceptions import MacaroonDeserializationException
from sqlalchemy.exc import NoResultFound
from sqlalchemy.orm import joinedload
from zope.interface import implementer

Expand Down Expand Up @@ -199,16 +198,12 @@ def get_macaroon_by_description(self, user_id, description):

Returns None if the user doesn't have a macaroon with this description.
"""
try:
dm = (
self.db.query(Macaroon)
.options(joinedload("user"))
.filter(Macaroon.description == description)
.filter(Macaroon.user_id == user_id)
.one()
)
except NoResultFound:
return None
dm = (
self.db.query(Macaroon)
.filter(Macaroon.description == description)
.filter(Macaroon.user_id == user_id)
.one_or_none()
)

return dm

Expand Down