← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/bugs/model/bug.py

  • Committer: Jeroen Vermeulen
  • Date: 2011-09-26 07:21:53 UTC
  • mfrom: (14031 devel)
  • mto: This revision was merged to the branch mainline in revision 14049.
  • Revision ID: jeroen.vermeulen@canonical.com-20110926072153-0lj7d2924rf5xpoc
Merge devel, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/bugs/model/bug.py
30
30
from functools import wraps
31
31
from itertools import chain
32
32
import operator
33
 
import pytz
34
33
import re
35
34
 
36
35
from lazr.lifecycle.event import (
39
38
    ObjectModifiedEvent,
40
39
    )
41
40
from lazr.lifecycle.snapshot import Snapshot
 
41
import pytz
42
42
from pytz import timezone
43
43
from sqlobject import (
44
44
    BoolCol,
122
122
    BranchLinkedToBug,
123
123
    BranchUnlinkedFromBug,
124
124
    BugConvertedToQuestion,
 
125
    BugDuplicateChange,
125
126
    BugWatchAdded,
126
127
    BugWatchRemoved,
127
 
    BugDuplicateChange,
128
128
    SeriesNominated,
129
129
    UnsubscribedFromBug,
130
130
    )
173
173
    )
174
174
from lp.bugs.model.bugwatch import BugWatch
175
175
from lp.bugs.model.structuralsubscription import (
 
176
    get_structural_subscribers,
176
177
    get_structural_subscriptions_for_bug,
177
 
    get_structural_subscribers,
178
178
    )
179
179
from lp.code.interfaces.branchcollection import IAllBranches
180
180
from lp.hardwaredb.interfaces.hwdb import IHWSubmissionBugSet
1793
1793
            recipients = BugNotificationRecipients()
1794
1794
            recipients.addBugSupervisor(subscriber)
1795
1795
            notification_text = ("This bug is no longer private so the bug "
1796
 
                "supervisor was unsubscribed. You will no longer be notified "
1797
 
                "of changes to this bug for privacy related reasons, but you "
1798
 
                "may receive notifications about this bug from other "
1799
 
                "subscriptions.")
 
1796
                "supervisor was unsubscribed. They will no longer be "
 
1797
                "notified of changes to this bug for privacy related "
 
1798
                "reasons, but may receive notifications about this bug from "
 
1799
                "other subscriptions.")
1800
1800
            self.unsubscribe(
1801
1801
                subscriber, who, ignore_permissions=True,
1802
1802
                send_notification=True,
1806
1806
            recipients = BugNotificationRecipients()
1807
1807
            recipients.addSecurityContact(subscriber)
1808
1808
            notification_text = ("This bug is no longer security related so "
1809
 
                "the security contact was unsubscribed. You will no longer "
1810
 
                "be notified of changes to this bug for privacy related "
1811
 
                "reasons, but you may receive notifications about this bug "
 
1809
                "the security contact was unsubscribed. They will no longer "
 
1810
                "be notified of changes to this bug for security related "
 
1811
                "reasons, but may receive notifications about this bug "
1812
1812
                "from other subscriptions.")
1813
1813
            self.unsubscribe(
1814
1814
                subscriber, who, ignore_permissions=True,