diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py index 78b91f6a6..9a6cdf868 100644 --- a/ietf/api/__init__.py +++ b/ietf/api/__init__.py @@ -66,7 +66,6 @@ class Serializer(BaseSerializer): elif isinstance(data, Bundle): return render("api/dictitem.html", {"data":dict((key, self.to_simple_html(val, options)) for (key, val) in data.data.items())}) elif hasattr(data, 'dehydrated_type'): - debug.show('data') if getattr(data, 'dehydrated_type', None) == 'related' and data.is_m2m == False: return render("api/relitem.html", {"fk": data.fk_resource, "val": self.to_simple_html(data.value, options)}) elif getattr(data, 'dehydrated_type', None) == 'related' and data.is_m2m == True: diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py index b440dd566..3481baf2f 100644 --- a/ietf/meeting/forms.py +++ b/ietf/meeting/forms.py @@ -3,7 +3,6 @@ import codecs from django import forms from django.db.models import Q -from django.forms.fields import DurationField from ietf.doc.models import Document, DocAlias, State, NewRevisionDocEvent from ietf.doc.utils import get_document_content @@ -14,7 +13,7 @@ from ietf.meeting.helpers import get_next_interim_number, make_materials_directo from ietf.meeting.helpers import is_meeting_approved, get_next_agenda_name from ietf.message.models import Message from ietf.person.models import Person -from ietf.utils.fields import DatepickerDateField +from ietf.utils.fields import DatepickerDateField, DurationField # need to insert empty option for use in ChoiceField # countries.insert(0, ('', '-'*9 )) diff --git a/ietf/secr/meetings/forms.py b/ietf/secr/meetings/forms.py index 1b6df431e..05a0c4c29 100644 --- a/ietf/secr/meetings/forms.py +++ b/ietf/secr/meetings/forms.py @@ -96,8 +96,9 @@ class MeetingModelForm(forms.ModelForm): def __init__(self,*args,**kwargs): super(MeetingModelForm, self).__init__(*args,**kwargs) - for f in [ 'idsubmit_cutoff_warning_days', 'idsubmit_cutoff_time_utc', ]: - self.fields[f].help_text = kwargs['instance']._meta.get_field(f).help_text + if 'instance' in kwargs: + for f in [ 'idsubmit_cutoff_warning_days', 'idsubmit_cutoff_time_utc', ]: + self.fields[f].help_text = kwargs['instance']._meta.get_field(f).help_text def clean_number(self): number = self.cleaned_data['number'] diff --git a/ietf/utils/fields.py b/ietf/utils/fields.py index 028c0e270..9e7351189 100644 --- a/ietf/utils/fields.py +++ b/ietf/utils/fields.py @@ -4,7 +4,7 @@ import re import six import datetime -import debug +import debug # pyflakes:ignore from django import forms from django.core.validators import validate_email