Use BOF consistently.

 - Legacy-Id: 19212

Author: rjsparks

ietf/doc/migrations/0042_bofreq_states.py

@@ -8,12 +8,12 @@ def forward(apps, schema_editor):
     StateType = apps.get_model('doc', 'StateType')
     State = apps.get_model('doc', 'State')
 
-    StateType.objects.create(slug='bofreq', label='Bof Request State')
-    proposed = State.objects.create(type_id='bofreq', slug='proposed', name='Proposed', used=True, desc='The bof request is proposed', order=0)
-    approved = State.objects.create(type_id='bofreq', slug='approved', name='Approved', used=True, desc='The bof request is approved', order=1)
-    declined = State.objects.create(type_id='bofreq', slug='declined', name='Declined', used=True, desc='The bof request is declined', order=2)
-    replaced = State.objects.create(type_id='bofreq', slug='replaced', name='Replaced', used=True, desc='The bof request is proposed', order=3)
-    abandoned = State.objects.create(type_id='bofreq', slug='abandoned', name='Abandoned', used=True, desc='The bof request is abandoned', order=4)
+    StateType.objects.create(slug='bofreq', label='BOF Request State')
+    proposed = State.objects.create(type_id='bofreq', slug='proposed', name='Proposed', used=True, desc='The BOF request is proposed', order=0)
+    approved = State.objects.create(type_id='bofreq', slug='approved', name='Approved', used=True, desc='The BOF request is approved', order=1)
+    declined = State.objects.create(type_id='bofreq', slug='declined', name='Declined', used=True, desc='The BOF request is declined', order=2)
+    replaced = State.objects.create(type_id='bofreq', slug='replaced', name='Replaced', used=True, desc='The BOF request is proposed', order=3)
+    abandoned = State.objects.create(type_id='bofreq', slug='abandoned', name='Abandoned', used=True, desc='The BOF request is abandoned', order=4)
 
     proposed.next_states.set([approved,declined,replaced,abandoned])
 

ietf/doc/models.py

@@ -1349,9 +1349,9 @@ class EditedAuthorsDocEvent(DocEvent):
     basis = models.CharField(help_text="What is the source or reasoning for the changes to the author list",max_length=255)
 
 class BofreqEditorDocEvent(DocEvent):
-    """ Capture the proponents of a Bof Request."""
+    """ Capture the proponents of a BOF Request."""
     editors = models.ManyToManyField('person.Person', blank=True)
 
 class BofreqResponsibleDocEvent(DocEvent):
-    """ Capture the responsible leadership (IAB and IESG members) for a BoF Request """
+    """ Capture the responsible leadership (IAB and IESG members) for a BOF Request """
     responsible = models.ManyToManyField('person.Person', blank=True)

ietf/doc/tests_bofreq.py

@@ -46,7 +46,7 @@ def write_bofreq_file(self, bofreq):
     def test_show_bof_requests(self):
         url = urlreverse('ietf.doc.views_bofreq.bof_requests')
         r = self.client.get(url)
-        self.assertContains(r, 'There are currently no BoF Requests', status_code=200)
+        self.assertContains(r, 'There are currently no BOF Requests', status_code=200)
         states = State.objects.filter(type_id='bofreq')
         self.assertTrue(states.count()>0)
         reqs = BofreqFactory.create_batch(states.count())

ietf/doc/tests_charter.py

@@ -275,7 +275,7 @@ def test_abandon_bof(self):
         login_testing_unauthorized(self, "secretary", url)
         response=self.client.get(url)
         self.assertEqual(response.status_code,200)
-        response = self.client.post(url,{'comment':'Testing Abandoning a Bof Charter'})
+        response = self.client.post(url,{'comment':'Testing Abandoning a BOF Charter'})
         self.assertEqual(response.status_code,302)
         charter = Document.objects.get(pk=charter.pk)
         self.assertEqual(charter.group.state_id,'abandon')

ietf/doc/views_bofreq.py

@@ -46,7 +46,7 @@ def clean_bofreq_content(self):
         content = self.cleaned_data["bofreq_content"].replace("\r", "")
         default_content = render_to_string('doc/bofreq/bofreq_template.md',{})
         if content==default_content:
-            raise forms.ValidationError('The example content may not be saved. Edit it as instructed to document this BoF request.')
+            raise forms.ValidationError('The example content may not be saved. Edit it as instructed to document this BOF request.')
         try:
             _ = markdown.markdown(content, extensions=['extra'])
         except Exception as e:
@@ -126,7 +126,7 @@ def clean_title(self):
         if name == 'bofreq-':
             raise forms.ValidationError('The filename derived from this title is empty. Please include a few descriptive words using ascii or numeric characters') 
         if Document.objects.filter(name=name).exists():
-            raise forms.ValidationError('This title produces a filename already used by an existing BoF request')
+            raise forms.ValidationError('This title produces a filename already used by an existing BOF request')
         return title
 
 @login_required

ietf/group/forms.py

@@ -188,11 +188,11 @@ def clean_acronym(self):
 
         if existing and existing.type_id == self.group_type:
             if existing.state_id == "bof":
-                #insert_confirm_field(label="Turn BoF %s into proposed %s and start chartering it" % (existing.acronym, existing.type.name), initial=True)
+                #insert_confirm_field(label="Turn BOF %s into proposed %s and start chartering it" % (existing.acronym, existing.type.name), initial=True)
                 if confirmed:
                     return acronym
                 else:
-                    raise forms.ValidationError("Warning: Acronym used for an existing BoF (%s)." % existing.acronym)
+                    raise forms.ValidationError("Warning: Acronym used for an existing BOF (%s)." % existing.acronym)
             else:
                 #insert_confirm_field(label="Set state of %s %s to proposed and start chartering it" % (existing.acronym, existing.type.name), initial=False)
                 if confirmed:
@@ -265,7 +265,7 @@ def clean(self):
         state = cleaned_data.get('state', None)
         parent = cleaned_data.get('parent', None)
         if state and (state.slug in ['bof', ] and 'parent' in self.fields and not parent):
-            raise forms.ValidationError("You requested the creation of a BoF, but specified no parent area.  A parent is required when creating a bof.")
+            raise forms.ValidationError("You requested the creation of a BOF, but specified no parent area.  A parent is required when creating a bof.")
         return cleaned_data
 
 

ietf/group/tests_info.py

@@ -561,7 +561,7 @@ def test_create_based_on_existing_bof(self):
         q = PyQuery(r.content)
         self.assertTrue(len(q('form .has-error')) > 0)
 
-        # try elevating BoF to WG
+        # try elevating BOF to WG
         group.state_id = "bof"
         group.save()
 

ietf/ipr/tests.py

@@ -180,6 +180,8 @@ def test_search(self):
 
         # find by patent info
         r = self.client.get(url + "?submit=patent&patent=%s" % ipr.patent_info)
+        debug.show('ipr.patent_info')
+        debug.show('r.content')
         self.assertContains(r, ipr.title)
 
         r = self.client.get(url + "?submit=patent&patent=US12345")

ietf/meeting/management/commands/create_dummy_meeting.py

@@ -366,7 +366,7 @@ def handle(self, *args, **options):
                     attendees=100,
                     agenda_note="",
                     requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""Must not conflict with Transport Area BoFs. """,  # this is implicit
+                    comments="""Must not conflict with Transport Area BOFs. """,  # this is implicit
                     remote_instructions="",
                 )
                 ## session for tsvwg ##
@@ -377,7 +377,7 @@ def handle(self, *args, **options):
                     attendees=100,
                     agenda_note="",
                     requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments="""Must not conflict with Transport Area BoFs. """,  # this is implicit
+                    comments="""Must not conflict with Transport Area BOFs. """,  # this is implicit
                     remote_instructions="",
                 )
                 c = Constraint.objects.create(meeting=m, source=s.group, name_id='conflict', target_id=1665, )  # intarea
@@ -440,7 +440,7 @@ def handle(self, *args, **options):
                     attendees=80,
                     agenda_note="Joint with ARTAREA",
                     requested_duration=datetime.timedelta(seconds=7200),  # 2:00:00
-                    comments=""" and avoid the same kind of conflicts with other area meetings and any Bofs and potential new ART WGs.""",  # this is implicit
+                    comments=""" and avoid the same kind of conflicts with other area meetings and any BOFs and potential new ART WGs.""",  # this is implicit
                     remote_instructions="",
                 )
                 s.joint_with_groups.set(Group.objects.filter(acronym='artarea'))
@@ -2598,7 +2598,7 @@ def handle(self, *args, **options):
                     attendees=50,
                     agenda_note="",
                     requested_duration=datetime.timedelta(seconds=5400),  # 1:30:00
-                    comments="""Please avoid collision with any Sec and IoT-related BoFs.""",
+                    comments="""Please avoid collision with any Sec and IoT-related BOFs.""",
                     remote_instructions="",
                 )
                 c = Constraint.objects.create(meeting=m, source=s.group, name_id='conflict', target_id=1187, )  # saag

ietf/meeting/management/commands/generate_schedule.py

@@ -705,24 +705,24 @@ def _calculate_cost_business_logic(self, overlapping_sessions):
         for other in overlapping_sessions:
             if not other:
                 continue
-            # BoFs cannot conflict with PRGs
+            # BOFs cannot conflict with PRGs
             if self.is_bof and other.is_prg:
-                violations.append('{}: BoF overlaps with PRG: {}'
+                violations.append('{}: BOF overlaps with PRG: {}'
                                   .format(self.group, other.group))
                 cost += self.business_constraint_costs['bof_overlapping_prg']
-            # BoFs cannot conflict with any other BoFs 
+            # BOFs cannot conflict with any other BOFs 
             if self.is_bof and other.is_bof:
-                violations.append('{}: BoF overlaps with other BoF: {}'
+                violations.append('{}: BOF overlaps with other BOF: {}'
                                   .format(self.group, other.group))
                 cost += self.business_constraint_costs['bof_overlapping_bof']
-            # BoFs cannot conflict with any other WGs in their area
+            # BOFs cannot conflict with any other WGs in their area
             if self.is_bof and self.parent == other.parent:
-                violations.append('{}: BoF overlaps with other session from same area: {}'
+                violations.append('{}: BOF overlaps with other session from same area: {}'
                                   .format(self.group, other.group))
                 cost += self.business_constraint_costs['bof_overlapping_area_wg']
-            # BoFs cannot conflict with any area-wide meetings (of any area) 
+            # BOFs cannot conflict with any area-wide meetings (of any area) 
             if self.is_bof and other.is_area_meeting:
-                violations.append('{}: BoF overlaps with area meeting {}'
+                violations.append('{}: BOF overlaps with area meeting {}'
                                   .format(self.group, other.group))
                 cost += self.business_constraint_costs['bof_overlapping_area_meeting']
             # Area meetings cannot conflict with anything else in their area