Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/features/dateaction.py b/features/dateaction.py
index 0cb3987..bd64d02 100644
--- a/features/dateaction.py
+++ b/features/dateaction.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Cron and task handlers for email notifications of issue date value arrival.
@@ -31,16 +30,15 @@
from framework import permissions
from framework import timestr
from framework import urls
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from tracker import tracker_bizobj
-from tracker import tracker_helpers
from tracker import tracker_views
TEMPLATE_PATH = framework_constants.TEMPLATE_PATH
-class DateActionCron(jsonfeed.FlaskInternalTask):
+class DateActionCron(jsonfeed.InternalTask):
"""Find and process issues with date-type values that arrived today."""
def HandleRequest(self, mr):
@@ -213,14 +211,6 @@
if (field.field_id in arrived_dates_by_field_id and
field.date_action in (tracker_pb2.DateAction.PING_OWNER_ONLY,
tracker_pb2.DateAction.PING_PARTICIPANTS))]
-
- # TODO(jrobbins): For now, assume all pings apply only to open issues.
- # Later, allow each date action to specify whether it applies to open
- # issues or all issues.
- means_open = tracker_helpers.MeansOpenInProject(
- tracker_bizobj.GetStatus(issue), config)
- pings = [ping for ping in pings if means_open]
-
pings = sorted(pings, key=lambda ping: ping[0].field_name)
return pings