diff --git a/data/model/release.py b/data/model/release.py index 883ae146e..9427f1e71 100644 --- a/data/model/release.py +++ b/data/model/release.py @@ -10,14 +10,12 @@ def set_region_release(service_name, region_name, version): def get_recent_releases(service_name, region_name): return (QuayRelease - .select(QuayRelease) - .join(QuayService) - .switch(QuayRelease) - .join(QuayRegion) - .where( - QuayService.name == service_name, - QuayRegion.name == region_name, - QuayRelease.reverted == False, - ) - .order_by(QuayRelease.created.desc()) - ) + .select(QuayRelease) + .join(QuayService) + .switch(QuayRelease) + .join(QuayRegion) + .where(QuayService.name == service_name, + QuayRegion.name == region_name, + QuayRelease.reverted == False, + ) + .order_by(QuayRelease.created.desc())) diff --git a/data/model/storage.py b/data/model/storage.py index 41eca2fd8..41c5583b0 100644 --- a/data/model/storage.py +++ b/data/model/storage.py @@ -97,17 +97,17 @@ def create_v1_storage(location_name): return storage -def find_or_create_storage_signature(storage, signature_kind): - found = lookup_storage_signature(storage, signature_kind) +def find_or_create_storage_signature(storage, signature_kind_name): + found = lookup_storage_signature(storage, signature_kind_name) if found is None: - kind = ImageStorageSignatureKind.get(name=signature_kind) + kind = ImageStorageSignatureKind.get(name=signature_kind_name) found = ImageStorageSignature.create(storage=storage, kind=kind) return found -def lookup_storage_signature(storage, signature_kind): - kind = ImageStorageSignatureKind.get(name=signature_kind) +def lookup_storage_signature(storage, signature_kind_name): + kind = ImageStorageSignatureKind.get(name=signature_kind_name) try: return (ImageStorageSignature .select() diff --git a/data/model/user.py b/data/model/user.py index 4db9e132b..38e240c9d 100644 --- a/data/model/user.py +++ b/data/model/user.py @@ -368,6 +368,7 @@ def lookup_federated_login(user, service_name): except FederatedLogin.DoesNotExist: return None + def create_confirm_email_code(user, new_email=None): if new_email: if not validate_email(new_email):