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
1=== modified file 'src/postorius/views/list.py'
2--- src/postorius/views/list.py 2015-04-14 18:40:12 +0000
3+++ src/postorius/views/list.py 2015-04-15 14:55:07 +0000
4@@ -503,7 +503,7 @@
5
6 @list_moderator_required
7 def discard_held_message(request, list_id, msg_id):
8- """Accepts a held message.
9+ """Discards a held message.
10 """
11 try:
12 the_list = List.objects.get_or_404(fqdn_listname=list_id)
13@@ -519,7 +519,7 @@
14
15 @list_moderator_required
16 def defer_held_message(request, list_id, msg_id):
17- """Accepts a held message.
18+ """Defers a held message for a later decision.
19 """
20 try:
21 the_list = List.objects.get_or_404(fqdn_listname=list_id)
22@@ -529,13 +529,13 @@
23 except HTTPError, e:
24 messages.error(request, e.msg)
25 return redirect('list_held_messages', the_list.list_id)
26- messages.success(request, 'The message has been defered.')
27+ messages.success(request, 'The message has been deferred.')
28 return redirect('list_held_messages', the_list.list_id)
29
30
31 @list_moderator_required
32 def reject_held_message(request, list_id, msg_id):
33- """Accepts a held message.
34+ """Rejects a held message.
35 """
36 try:
37 the_list = List.objects.get_or_404(fqdn_listname=list_id)

Subscribers

People subscribed via source and target branches