← Back to branch summary

~barry/mailman/events-and-web

« back to all changes in this revision

Viewing changes to src/mailman/runners/nntp.py

  • Committer: Barry Warsaw
  • Date: 2012-03-31 10:51:42 UTC
  • mto: This revision was merged to the branch mainline in revision 7140.
  • Revision ID: barry@list.org-20120331105142-tq8akrvi9lbq50hw
 * The `news` runner and queue has been renamed to the more accurate `nntp`.
   Beta testers can can safely remove `$var_dir/queue/news`.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mailman/runners/nntp.py
99
99
    # messages? TK: We use stripped_subject (prefix stripped) which was
100
100
    # crafted in CookHeaders.py to ensure prefix was stripped from the subject
101
101
    # came from mailing list user.
102
 
    stripped_subject = msgdata.get('stripped_subject') \
103
 
                       or msgdata.get('origsubj')
 
102
    stripped_subject = msgdata.get('stripped_subject',
 
103
                                   msgdata.get('original_subject'))
104
104
    if not mlist.news_prefix_subject_too and stripped_subject is not None:
105
105
        del msg['subject']
106
106
        msg['subject'] = stripped_subject