Merge lp:~sumanah/postorius/held-msg-docstring into lp:postorius

Proposed by Sumana Harihareswara
Status: Merged
Merged at revision: 240
Proposed branch: lp:~sumanah/postorius/held-msg-docstring
Merge into: lp:postorius
Diff against target: 37 lines (+4/-4)
1 file modified
src/postorius/views/list.py (+4/-4)
To merge this branch: bzr merge lp:~sumanah/postorius/held-msg-docstring
Reviewer Review Type Date Requested Status
Abhilash Raj Approve
Terri Pending
Review via email: mp+256334@code.launchpad.net

Description of the change

The docstrings for dealing with held messages are inaccurate - this fixes that.

To post a comment you must log in.
Revision history for this message
Abhilash Raj (raj-abhilash1) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/postorius/views/list.py'
--- src/postorius/views/list.py 2015-04-14 18:40:12 +0000
+++ src/postorius/views/list.py 2015-04-15 14:55:07 +0000
@@ -503,7 +503,7 @@
503503
504@list_moderator_required504@list_moderator_required
505def discard_held_message(request, list_id, msg_id):505def discard_held_message(request, list_id, msg_id):
506 """Accepts a held message.506 """Discards a held message.
507 """507 """
508 try:508 try:
509 the_list = List.objects.get_or_404(fqdn_listname=list_id)509 the_list = List.objects.get_or_404(fqdn_listname=list_id)
@@ -519,7 +519,7 @@
519519
520@list_moderator_required520@list_moderator_required
521def defer_held_message(request, list_id, msg_id):521def defer_held_message(request, list_id, msg_id):
522 """Accepts a held message.522 """Defers a held message for a later decision.
523 """523 """
524 try:524 try:
525 the_list = List.objects.get_or_404(fqdn_listname=list_id)525 the_list = List.objects.get_or_404(fqdn_listname=list_id)
@@ -529,13 +529,13 @@
529 except HTTPError, e:529 except HTTPError, e:
530 messages.error(request, e.msg)530 messages.error(request, e.msg)
531 return redirect('list_held_messages', the_list.list_id)531 return redirect('list_held_messages', the_list.list_id)
532 messages.success(request, 'The message has been defered.')532 messages.success(request, 'The message has been deferred.')
533 return redirect('list_held_messages', the_list.list_id)533 return redirect('list_held_messages', the_list.list_id)
534534
535535
536@list_moderator_required536@list_moderator_required
537def reject_held_message(request, list_id, msg_id):537def reject_held_message(request, list_id, msg_id):
538 """Accepts a held message.538 """Rejects a held message.
539 """539 """
540 try:540 try:
541 the_list = List.objects.get_or_404(fqdn_listname=list_id)541 the_list = List.objects.get_or_404(fqdn_listname=list_id)

Subscribers

People subscribed via source and target branches