Skip to content

Commit 7f277a8

Browse files
committed
Replace user.get_profile() with user.person, the profile stuff is deprecated since Django 1.5
- Legacy-Id: 6968
1 parent ea24f5c commit 7f277a8

36 files changed

Lines changed: 125 additions & 126 deletions

ietf/community/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def check_manager(self, user):
3030
if not self.group or self.group.type.slug not in ('area', 'wg'):
3131
return False
3232
try:
33-
person = user.get_profile()
33+
person = user.person
3434
except:
3535
return False
3636
if self.group.type.slug == 'area':

ietf/community/templatetags/community_tags.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def render(self, context):
2020
return ''
2121
lists = {'personal': CommunityList.objects.get_or_create(user=user)[0]}
2222
try:
23-
person = user.get_profile()
23+
person = user.person
2424
groups = []
2525
managed_areas = [i.group for i in Role.objects.filter(name__slug='ad', email__in=person.email_set.all())]
2626
for area in managed_areas:

ietf/doc/lastcall.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def request_last_call(request, doc):
2121

2222
e = DocEvent()
2323
e.type = "requested_last_call"
24-
e.by = request.user.get_profile()
24+
e.by = request.user.person
2525
e.doc = doc
2626
e.desc = "Last call was requested"
2727
e.save()

ietf/doc/mails.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def generate_ballot_writeup(request, doc):
9090

9191
e = WriteupDocEvent()
9292
e.type = "changed_ballot_writeup_text"
93-
e.by = request.user.get_profile()
93+
e.by = request.user.person
9494
e.doc = doc
9595
e.desc = u"Ballot writeup was generated"
9696
e.text = unicode(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana}))
@@ -132,7 +132,7 @@ def generate_last_call_announcement(request, doc):
132132

133133
e = WriteupDocEvent()
134134
e.type = "changed_last_call_text"
135-
e.by = request.user.get_profile()
135+
e.by = request.user.person
136136
e.doc = doc
137137
e.desc = u"Last call announcement was generated"
138138
e.text = unicode(mail)
@@ -151,7 +151,7 @@ def generate_approval_mail(request, doc):
151151

152152
e = WriteupDocEvent()
153153
e.type = "changed_ballot_approval_text"
154-
e.by = request.user.get_profile()
154+
e.by = request.user.person
155155
e.doc = doc
156156
e.desc = u"Ballot approval text was generated"
157157
e.text = unicode(mail)

ietf/doc/views_ballot.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def do_undefer_ballot(request, doc):
4545
Helper function to perform undefer of ballot. Takes the Request object, for use in
4646
logging, and the Document object.
4747
'''
48-
login = request.user.get_profile()
48+
login = request.user.person
4949
telechat_date = TelechatDate.objects.active().order_by("date")[0].date
5050
save_document_in_history(doc)
5151

@@ -113,7 +113,7 @@ def edit_position(request, name, ballot_id):
113113
doc = get_object_or_404(Document, docalias__name=name)
114114
ballot = get_object_or_404(BallotDocEvent, type="created_ballot", pk=ballot_id, doc=doc)
115115

116-
ad = login = request.user.get_profile()
116+
ad = login = request.user.person
117117

118118
if 'HTTP_REFERER' in request.META:
119119
return_to_url = request.META['HTTP_REFERER']
@@ -249,7 +249,7 @@ def send_ballot_comment(request, name, ballot_id):
249249
doc = get_object_or_404(Document, docalias__name=name)
250250
ballot = get_object_or_404(BallotDocEvent, type="created_ballot", pk=ballot_id, doc=doc)
251251

252-
ad = login = request.user.get_profile()
252+
ad = login = request.user.person
253253

254254
return_to_url = request.GET.get('return_to_url')
255255
if not return_to_url:
@@ -325,7 +325,7 @@ def clear_ballot(request, name):
325325
"""Clear all positions and discusses on every open ballot for a document."""
326326
doc = get_object_or_404(Document, name=name)
327327
if request.method == 'POST':
328-
by = request.user.get_profile()
328+
by = request.user.person
329329
for t in BallotType.objects.filter(doc_type=doc.type_id):
330330
close_ballot(doc, by, t.slug)
331331
create_ballot_if_not_open(doc, by, t.slug)
@@ -347,7 +347,7 @@ def defer_ballot(request, name):
347347
if doc.type_id == 'draft' and not doc.get_state("draft-iesg"):
348348
raise Http404()
349349

350-
login = request.user.get_profile()
350+
login = request.user.person
351351
telechat_date = TelechatDate.objects.active().order_by("date")[1].date
352352

353353
if request.method == 'POST':
@@ -421,7 +421,7 @@ def lastcalltext(request, name):
421421
if not doc.get_state("draft-iesg"):
422422
raise Http404()
423423

424-
login = request.user.get_profile()
424+
login = request.user.person
425425

426426
existing = doc.latest_event(WriteupDocEvent, type="changed_last_call_text")
427427
if not existing:
@@ -504,7 +504,7 @@ def ballot_writeupnotes(request, name):
504504
"""Editing of ballot write-up and notes"""
505505
doc = get_object_or_404(Document, docalias__name=name)
506506

507-
login = request.user.get_profile()
507+
login = request.user.person
508508

509509
existing = doc.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text")
510510
if not existing:
@@ -585,7 +585,7 @@ def ballot_approvaltext(request, name):
585585
if not doc.get_state("draft-iesg"):
586586
raise Http404()
587587

588-
login = request.user.get_profile()
588+
login = request.user.person
589589

590590
existing = doc.latest_event(WriteupDocEvent, type="changed_ballot_approval_text")
591591
if not existing:
@@ -633,7 +633,7 @@ def approve_ballot(request, name):
633633
if not doc.get_state("draft-iesg"):
634634
raise Http404()
635635

636-
login = request.user.get_profile()
636+
login = request.user.person
637637

638638
e = doc.latest_event(WriteupDocEvent, type="changed_ballot_approval_text")
639639
if not e:
@@ -742,7 +742,7 @@ def make_last_call(request, name):
742742
if not (doc.get_state("draft-iesg") or doc.get_state("statchg")):
743743
raise Http404
744744

745-
login = request.user.get_profile()
745+
login = request.user.person
746746

747747
e = doc.latest_event(WriteupDocEvent, type="changed_last_call_text")
748748
if not e:

ietf/doc/views_conflict_review.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def change_state(request, name, option=None):
3535
and logging the change as a comment."""
3636
review = get_object_or_404(Document, type="conflrev", name=name)
3737

38-
login = request.user.get_profile()
38+
login = request.user.person
3939

4040
if request.method == 'POST':
4141
form = ChangeStateForm(request.POST)
@@ -126,7 +126,7 @@ def save(self, review):
126126
def submit(request, name):
127127
review = get_object_or_404(Document, type="conflrev", name=name)
128128

129-
login = request.user.get_profile()
129+
login = request.user.person
130130

131131
path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.canonical_name(), review.rev))
132132
not_uploaded_yet = review.rev == "00" and not os.path.exists(path)
@@ -209,7 +209,7 @@ def edit_notices(request, name):
209209
review.notify = form.cleaned_data['notify']
210210
review.save()
211211

212-
login = request.user.get_profile()
212+
login = request.user.person
213213
c = DocEvent(type="added_comment", doc=review, by=login)
214214
c.desc = "Notification list changed to : "+review.notify
215215
c.save()
@@ -243,7 +243,7 @@ def edit_ad(request, name):
243243
review.ad = form.cleaned_data['ad']
244244
review.save()
245245

246-
login = request.user.get_profile()
246+
login = request.user.person
247247
c = DocEvent(type="added_comment", doc=review, by=login)
248248
c.desc = "Shepherding AD changed to "+review.ad.name
249249
c.save()
@@ -300,7 +300,7 @@ def approve(request, name):
300300
if review.get_state('conflrev').slug not in ('appr-reqnopub-pend','appr-noprob-pend'):
301301
raise Http404
302302

303-
login = request.user.get_profile()
303+
login = request.user.person
304304

305305
if request.method == 'POST':
306306

@@ -380,7 +380,7 @@ def start_review(request, name):
380380
if [ rel.source for alias in doc_to_review.docalias_set.all() for rel in alias.relateddocument_set.filter(relationship='conflrev') ]:
381381
raise Http404
382382

383-
login = request.user.get_profile()
383+
login = request.user.person
384384

385385

386386
if request.method == 'POST':
@@ -448,7 +448,7 @@ def start_review(request, name):
448448
@role_required("Area Director", "Secretariat")
449449
def telechat_date(request, name):
450450
doc = get_object_or_404(Document, type="conflrev", name=name)
451-
login = request.user.get_profile()
451+
login = request.user.person
452452

453453
e = doc.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
454454
initial_returning_item = bool(e and e.returning_item)

ietf/doc/views_doc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ def add_comment(request, name):
745745
"""Add comment to history of document."""
746746
doc = get_object_or_404(Document, docalias__name=name)
747747

748-
login = request.user.get_profile()
748+
login = request.user.person
749749

750750
if request.method == 'POST':
751751
form = AddCommentForm(request.POST)

0 commit comments

Comments
 (0)