Skip to content

test: Use QuerySetAny alias for QuerySet type checks #5722

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

test: Use QuerySetAny alias for QuerySet type checks #5722

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3015359
test: Use QuerySetAny alias for QuerySet type checks
jennifer-richards May 31, 2023
e121b5d
fix: Return NomComs, not Groups, from active_nomcoms filter
jennifer-richards May 31, 2023
8cd09ab
Revert "fix: Return NomComs, not Groups, from active_nomcoms filter"
jennifer-richards May 31, 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
6 changes: 3 additions & 3 deletions ietf/doc/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

from django.conf import settings
from django.contrib import messages
from django.db.models import QuerySet
from django.forms import ValidationError
from django.http import Http404
from django.template.loader import render_to_string
from django.utils import timezone
from django.utils.html import escape
from django.urls import reverse as urlreverse

from django_stubs_ext import QuerySetAny

import debug # pyflakes:ignore
from ietf.community.models import CommunityList
Expand Down Expand Up @@ -345,15 +345,15 @@ def augment_events_with_revision(doc, events):
"""Take a set of events for doc and add a .rev attribute with the
revision they refer to by checking NewRevisionDocEvents."""

if isinstance(events, QuerySet):
if isinstance(events, QuerySetAny):
qs = events.filter(newrevisiondocevent__isnull=False)
else:
qs = NewRevisionDocEvent.objects.filter(doc=doc)
event_revisions = list(qs.order_by('time', 'id').values('id', 'rev', 'time'))

if doc.type_id == "draft" and doc.get_state_slug() == "rfc":
# add fake "RFC" revision
if isinstance(events, QuerySet):
if isinstance(events, QuerySetAny):
e = events.filter(type="published_rfc").order_by('time').last()
else:
e = doc.latest_event(type="published_rfc")
Expand Down