Skip to content

Commit 26bf387

Browse files
committed
Replaced direct assignment to m2m fields with .clear() and .set()
- Legacy-Id: 14666
1 parent 36b5e2e commit 26bf387

9 files changed

Lines changed: 21 additions & 16 deletions

File tree

ietf/community/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def reset_name_contains_index_for_rule(rule):
7272
if not rule.rule_type == "name_contains":
7373
return
7474

75-
rule.name_contains_index = Document.objects.filter(docalias__name__regex=rule.text)
75+
rule.name_contains_index.set(Document.objects.filter(docalias__name__regex=rule.text))
7676

7777
def update_name_contains_indexes_with_new_doc(doc):
7878
for r in SearchRule.objects.filter(rule_type="name_contains"):

ietf/doc/tests_draft.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ def test_right_state_choices_offered(self):
12741274
class ChangeStreamStateTests(TestCase):
12751275
def test_set_tags(self):
12761276
draft = make_test_data()
1277-
draft.tags = DocTagName.objects.filter(slug="w-expert")
1277+
draft.tags.set(DocTagName.objects.filter(slug="w-expert"))
12781278
draft.group.unused_tags.add("w-refdoc")
12791279

12801280
url = urlreverse('ietf.doc.views_draft.change_stream_state', kwargs=dict(name=draft.name, state_type="draft-stream-ietf"))

ietf/doc/views_draft.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,8 +1230,8 @@ class PublicationForm(forms.Form):
12301230
m.save()
12311231

12321232
if doc.group.acronym != "none":
1233-
m.related_groups = [doc.group]
1234-
m.related_docs = [doc]
1233+
m.related_groups.set([doc.group])
1234+
m.related_docs.set([doc])
12351235

12361236
send_mail_message(request, m)
12371237

@@ -1514,7 +1514,8 @@ def change_stream_state(request, name, state_type):
15141514
new_tags = set(form.cleaned_data["tags"])
15151515

15161516
if existing_tags != new_tags:
1517-
doc.tags = new_tags
1517+
doc.tags.clear()
1518+
doc.tags.set(new_tags)
15181519

15191520
e = DocEvent(type="changed_document", doc=doc, rev=doc.rev, by=by)
15201521
added_tags = new_tags - existing_tags

ietf/group/milestones.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,9 @@ def save_milestone_form(f):
226226

227227
if not history:
228228
history = save_milestone_in_history(m)
229-
230-
m.docs = new_docs
229+
230+
m.docs.clear()
231+
m.docs.set(new_docs)
231232

232233
if len(changes) > 1:
233234
m.save()
@@ -239,7 +240,7 @@ def save_milestone_form(f):
239240
set_attributes_from_form(f, m)
240241
m.save()
241242

242-
m.docs = c["docs"]
243+
m.docs.set(c["docs"])
243244

244245
named_milestone = 'milestone "%s"' % m.desc
245246
if milestone_set == "charter":
@@ -366,7 +367,8 @@ def reset_charter_milestones(request, group_type, acronym):
366367
due=m.due,
367368
resolved=m.resolved,
368369
)
369-
new.docs = m.docs.all()
370+
new.docs.clear()
371+
new.docs.set(m.docs.all())
370372

371373
DocEvent.objects.create(type="changed_charter_milestone",
372374
doc=group.charter,

ietf/group/tests_info.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,15 +774,15 @@ def create_test_milestones(self):
774774
due=datetime.date.today(),
775775
resolved="",
776776
state_id="active")
777-
m1.docs = [draft]
777+
m1.docs.set([draft])
778778

779779
m2 = GroupMilestone.objects.create(id=2,
780780
group=group,
781781
desc="Test 2",
782782
due=datetime.date.today(),
783783
resolved="",
784784
state_id="charter")
785-
m2.docs = [draft]
785+
m2.docs.set([draft])
786786

787787
return (m1, m2, group)
788788

ietf/secr/sreq/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def confirm(request, acronym):
264264
)
265265
session_save(new_session)
266266
if 'resources' in form.data:
267-
new_session.resources = session_data['resources']
267+
new_session.resources.set(session_data['resources'])
268268

269269
# write constraint records
270270
save_conflicts(group,meeting,form.data.get('conflict1',''),'conflict')

ietf/submit/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def post_submission(request, submission, approvedDesc):
264264

265265
update_authors(draft, submission)
266266

267-
draft.formal_languages = submission.formal_languages.all()
267+
draft.formal_languages.set(submission.formal_languages.all())
268268

269269
trouble = rebuild_reference_relations(draft, filename=os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (submission.name, submission.rev)))
270270
if trouble:
@@ -691,7 +691,7 @@ def fill_in_submission(form, submission, authors, abstract, file_size):
691691

692692
submission.save()
693693

694-
submission.formal_languages = FormalLanguageName.objects.filter(slug__in=form.parsed_draft.get_formal_languages())
694+
submission.formal_languages.set(FormalLanguageName.objects.filter(slug__in=form.parsed_draft.get_formal_languages()))
695695

696696
def apply_checkers(submission, file_name):
697697
# run submission checkers

ietf/submit/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,8 @@ def edit_submission(request, submission_id, access_token=None):
395395

396396
formal_languages_changed = False
397397
if set(submission.formal_languages.all()) != set(edit_form.cleaned_data["formal_languages"]):
398-
submission.formal_languages = edit_form.cleaned_data["formal_languages"]
398+
submission.formal_languages.clear()
399+
submission.formal_languages.set(edit_form.cleaned_data["formal_languages"])
399400
formal_languages_changed = True
400401

401402
send_manual_post_request(request, submission, errors)

ietf/sync/rfceditor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ def update_drafts_from_queue(drafts):
196196

197197
t = DocTagName.objects.filter(slug__in=tags)
198198
if set(t) != set(d.tags.all()):
199-
d.tags = t
199+
d.tags.clear()
200+
d.tags.set(t)
200201
changed.add(name)
201202

202203
if events:

0 commit comments

Comments
 (0)