Added dates to unreachable() calls, to make it easier to decide when to remove marked code.

 - Legacy-Id: 13538

Author: levkowetz

ietf/doc/views_draft.py

@@ -280,7 +280,7 @@ def change_stream(request, name):
 
 @jsonapi
 def doc_ajax_internet_draft(request):
-    log.unreachable()                   # 6.46.2
+    log.unreachable("07 Mar 2017")
     if request.method != 'GET' or not request.GET.has_key('term'):
         return { 'success' : False, 'error' : 'No term submitted or not GET' }
     q = request.GET.get('term')

ietf/meeting/helpers.py

@@ -429,7 +429,7 @@ def get_earliest_session_date(formset):
 
 def get_interim_initial(meeting):
     '''Returns a dictionary suitable to initialize a InterimRequestForm'''
-    log.unreachable()                   # 6.46.2
+    log.unreachable("07 Mar 2017")
     initial = {}
     initial['group'] = meeting.session_set.first().group
     if meeting.city:
@@ -449,7 +449,7 @@ def get_interim_initial(meeting):
 
 def get_interim_session_initial(meeting):
     '''Returns a list of dictionaries suitable to initialize a InterimSessionForm'''
-    log.unreachable()                   # 6.46.2
+    log.unreachable("07 Mar 2017")
     initials = []
     for session in meeting.session_set.all():
         initial = {}
@@ -620,7 +620,7 @@ def send_interim_minutes_reminder(meeting):
 def check_interim_minutes():
     """Finds interim meetings that occured 10 days ago, if they don't
     have minutes send a reminder."""
-    log.unreachable()                   # 6.46.2
+    log.unreachable("07 Mar 2017")
     date = datetime.datetime.today() - datetime.timedelta(days=10)
     meetings = Meeting.objects.filter(type='interim', session__status='sched', date=date)
     for meeting in meetings:

ietf/meeting/models.py

@@ -532,7 +532,7 @@ def json_url(self):
     rooms.
     """
     def create_concurrent_timeslots(self):
-        log.unreachable()
+        log.unreachable("28 Feb 2017")
         rooms = self.meeting.room_set.all()
         self.room = rooms[0]
 	self.save()
@@ -678,7 +678,7 @@ def qs_assignments_with_sessions(self):
 
     @property
     def group_mapping(self):
-        log.unreachable()
+        log.unreachable("28 Feb 2017")
         assignments,sessions,total,scheduled = self.group_session_mapping
         return assignments
 
@@ -690,7 +690,7 @@ def sessions_that_can_meet(self):
 
     # calculate badness of entire schedule
     def calc_badness(self):
-        log.unreachable()
+        log.unreachable("28 Feb 2017")
         # now calculate badness
         assignments = self.group_mapping
         return self.calc_badness1(assignments)
@@ -740,7 +740,7 @@ def slot_to_the_right(self):
 
     @property
     def area(self):
-        log.unreachable()
+        log.unreachable("28 Feb 2017")
         if not self.session or not self.session.group:
             return ""
         if self.session.group.type_id == "irtf":
@@ -753,7 +753,7 @@ def area(self):
 
     @property
     def slottype(self):
-        log.unreachable()
+        log.unreachable("28 Feb 2017")
         if self.timeslot and self.timeslot.type:
             return self.timeslot.type.slug
         else:
@@ -854,7 +854,7 @@ def brief_display(self):
             return u"%s " % (self.person)
 
     def status(self):
-        log.unreachable()
+        log.unreachable("28 Feb 2017")
         if self.active_status is not None:
             return self.active_status
         else:
@@ -1075,7 +1075,7 @@ def official_timeslotassignment(self):
         return self.timeslotassignment_for_agenda(self.meeting.agenda)
 
     def unique_constraints(self):
-        log.unreachable()
+        log.unreachable("28 Feb 2017")
         global constraint_cache_uses, constraint_cache_initials
         constraint_cache_uses += 1
         # this cache keeps the automatic placer from visiting the database continuously

ietf/meeting/views.py

@@ -270,7 +270,7 @@ class Meta:
 
 @role_required('Secretariat')
 def edit_roomurl(request, num, roomid):
-    log.unreachable()                   # 6.46.2
+    log.unreachable("07 Mar 2017")
     meeting = get_meeting(num)
 
     try:

ietf/utils/log.py

@@ -106,12 +106,12 @@ def assertion(statement):
                     extra[key] = frame.f_locals[key]
             logger.error("Assertion '%s' failed.", statement, exc_info=(AssertionError, statement, tb), extra=extra)
 
-def unreachable():
+def unreachable(date="(unknown)"):
     "Raises an assertion or sends traceback to admins if executed."
     stack = inspect.stack()[1:]
     frame = stack[0][0]
     if settings.DEBUG is True or settings.SERVER_MODE == 'test':
-        raise AssertionError("Arrived at code in %s() which was marked unreachable." % frame.f_code.co_name)
+        raise AssertionError("Arrived at code in %s() which was marked unreachable on %s." % (frame.f_code.co_name, date))
     else:
         # build a simulated traceback object
         tb = build_traceback(stack)
@@ -120,5 +120,6 @@ def unreachable():
         for key in [ 'request', 'status_code', ]:
             if key in frame.f_locals:
                 extra[key] = frame.f_locals[key]
-        logger.error("Arrived at code in %s() which was marked unreachable.", frame.f_code.co_name, exc_info=(AssertionError, frame.f_code.co_name, tb), extra=extra)
+        logger.error("Arrived at code in %s() which was marked unreachable on %s." % (frame.f_code.co_name, date),
+                        exc_info=(AssertionError, frame.f_code.co_name, tb), extra=extra)
 

ietf/utils/mail.py

@@ -170,7 +170,7 @@ def send_mail_subj(request, to, frm, stemplate, template, context, *args, **kwar
     Send an email message, exactly as send_mail(), but the
     subject field is a template.
     '''
-    unreachable()                       # 03 Mar 2017
+    unreachable("03 Mar 2017")
     subject = render_to_string(stemplate, context ).replace("\n"," ").strip()
     return send_mail(request, to, frm, subject, template, context, *args, **kwargs)