Added a pylint rc-file, and fixed or silenced a number of issues found by pylint using the settings .pylintrc (which enable only error checking).

levkowetz · levkowetz · commit ec684e1b4e7b · 2016-09-08T14:48:59.000Z
- Legacy-Id: 11941
diff --git a/.pylintrc b/.pylintrc
diff --git a/ietf/dbtemplate/template.py b/ietf/dbtemplate/template.py
@@ -26,7 +26,7 @@ def __init__(self, template_string, origin=None, name='<Unknown Template>'):
         self.name = name
 
     def render(self, context):
-        raise NotImplemented
+        raise NotImplementedError
 
 
 class PlainTemplate(Template):
diff --git a/ietf/doc/factories.py b/ietf/doc/factories.py
@@ -31,23 +31,23 @@ def name(self, n):
     alias = factory.RelatedFactory('ietf.doc.factories.DocAliasFactory','document')
 
     @factory.post_generation
-    def other_aliases(self, create, extracted, **kwargs):
+    def other_aliases(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         if create and extracted:
             for alias in extracted:
-                self.docalias_set.create(name=alias) 
+                obj.docalias_set.create(name=alias) 
 
     @factory.post_generation
-    def states(self, create, extracted, **kwargs):
+    def states(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         if create and extracted:
             for (state_type_id,state_slug) in extracted:
-                self.set_state(State.objects.get(type_id=state_type_id,slug=state_slug))
+                obj.set_state(State.objects.get(type_id=state_type_id,slug=state_slug))
 
     @factory.post_generation
-    def authors(self, create, extracted, **kwargs):
+    def authors(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         if create and extracted:
             order = 0
             for email in extracted:
-                DocumentAuthor.objects.create(document=self, author=email, order=order)
+                DocumentAuthor.objects.create(document=obj, author=email, order=order)
                 order += 1
 
     @classmethod
diff --git a/ietf/ietfauth/forms.py b/ietf/ietfauth/forms.py
@@ -74,7 +74,7 @@ class Meta:
             exclude = exclude_list
 
         def __init__(self, *args, **kwargs):
-            super(ModelForm, self).__init__(*args, **kwargs)
+            super(PersonForm, self).__init__(*args, **kwargs)
 
             # blank ascii if it's the same as name
             self.fields["ascii"].required = self.fields["ascii"].widget.is_required = False
diff --git a/ietf/ipr/forms.py b/ietf/ipr/forms.py
@@ -227,7 +227,7 @@ def clean(self):
         return cleaned_data
 
     def save(self, *args, **kwargs):
-        obj = super(IprDisclosureFormBase, self).save(*args,commit=False)
+        obj = super(HolderIprDisclosureForm, self).save(*args,commit=False)
         if self.cleaned_data.get('same_as_ii_above') == True:
             obj.submitter_name = obj.holder_contact_name
             obj.submitter_email = obj.holder_contact_email
diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py
@@ -199,8 +199,8 @@ def prepare_value(self, value):
         if (hasattr(value, '__iter__') and
                 not isinstance(value, six.text_type) and
                 not hasattr(value, '_meta')):
-            return [super(forms.ModelMultipleChoiceField, self).prepare_value(v) for v in value]
-        return super(forms.ModelMultipleChoiceField, self).prepare_value(value)
+            return [super(CustomModelMultipleChoiceField, self).prepare_value(v) for v in value]
+        return super(CustomModelMultipleChoiceField, self).prepare_value(value)
 
 
 class LiaisonModelForm(BetterModelForm):
diff --git a/ietf/meeting/factories.py b/ietf/meeting/factories.py
@@ -38,7 +38,7 @@ def number(self,n):
             return 'interim-%d-%s-%02d'%(self.date.year,GroupFactory().acronym,n)
 
     @factory.post_generation
-    def populate_agenda(self, create, extracted, **kwargs):
+    def populate_agenda(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         '''
         Create a default agenda, unless the factory is called
         with populate_agenda=False
@@ -47,9 +47,9 @@ def populate_agenda(self, create, extracted, **kwargs):
             extracted = True
         if create and extracted:
             for x in range(3):
-                TimeSlotFactory(meeting=self)
-            self.agenda = ScheduleFactory(meeting=self)
-            self.save()
+                TimeSlotFactory(meeting=obj)
+            obj.agenda = ScheduleFactory(meeting=obj)
+            obj.save()
 
 
 class SessionFactory(factory.DjangoModelFactory):
@@ -63,16 +63,16 @@ class Meta:
     status_id='sched'
 
     @factory.post_generation
-    def add_to_schedule(self, create, extracted, **kwargs):
+    def add_to_schedule(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         '''
         Put this session in a timeslot unless the factory is called
         with add_to_schedule=False
         '''
         if extracted is None:
             extracted = True
         if create and extracted:
-            ts = self.meeting.timeslot_set.all()
-            self.timeslotassignments.create(timeslot=ts[random.randrange(len(ts))],schedule=self.meeting.agenda)
+            ts = obj.meeting.timeslot_set.all()
+            obj.timeslotassignments.create(timeslot=ts[random.randrange(len(ts))],schedule=obj.meeting.agenda)
 
 class ScheduleFactory(factory.DjangoModelFactory):
     class Meta:
diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
@@ -1215,7 +1215,7 @@ def agenda_file(self):
             
         return self._agenda_file
     def badness_test(self, num):
-        from settings import BADNESS_CALC_LOG
+        from settings import BADNESS_CALC_LOG # pylint: disable=import-error
         #sys.stdout.write("num: %u / BAD: %u\n" % (num, BADNESS_CALC_LOG))
         return BADNESS_CALC_LOG >= num
 
@@ -1245,7 +1245,7 @@ def badness(self, assignments):
 
         if self.badness_test(2):
             self.badness_log(2, "badness for group: %s has %u constraints\n" % (self.group.acronym, len(conflicts)))
-        from settings import BADNESS_UNPLACED, BADNESS_TOOSMALL_50, BADNESS_TOOSMALL_100, BADNESS_TOOBIG, BADNESS_MUCHTOOBIG
+        from settings import BADNESS_UNPLACED, BADNESS_TOOSMALL_50, BADNESS_TOOSMALL_100, BADNESS_TOOBIG, BADNESS_MUCHTOOBIG # pylint: disable=import-error
         count = 0
         myss_list = assignments[self.group]
         # for each constraint of this sessions' group, by group
@@ -1364,7 +1364,7 @@ def setup_conflicts(self):
     #    not being scheduled is worth  10,000,000 points
     #
     def badness_fast(self, timeslot, scheduleslot, session_pk_list):
-        from settings import BADNESS_UNPLACED, BADNESS_TOOSMALL_50, BADNESS_TOOSMALL_100, BADNESS_TOOBIG, BADNESS_MUCHTOOBIG
+        from settings import BADNESS_UNPLACED, BADNESS_TOOSMALL_50, BADNESS_TOOSMALL_100, BADNESS_TOOBIG, BADNESS_MUCHTOOBIG # pylint: disable=import-error
 
         badness = 0
 
diff --git a/ietf/meeting/timedeltafield.py b/ietf/meeting/timedeltafield.py
@@ -59,7 +59,7 @@ def formfield(self, *args, **kwargs):
 
     def value_to_string(self, obj):
         value = self._get_val_from_obj(obj)
-        return self.get_db_prep_value(value)
+        return self.get_db_prep_value(value) # pylint: disable=no-value-for-parameter
 
 
 class TimedeltaFormField(forms.Field):
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
@@ -141,7 +141,7 @@ def agenda_create(request, num=None, owner=None, name=None):
 
     if schedule is None:
         # here we have to return some ajax to display an error.
-        messages.error("Error: No meeting information for meeting %s owner %s schedule %s available" % (num, owner, name))
+        messages.error("Error: No meeting information for meeting %s owner %s schedule %s available" % (num, owner, name)) # pylint: disable=no-value-for-parameter
         return redirect(edit_agenda, num=num, owner=owner, name=name)
 
     # authorization was enforced by the @group_require decorator above.
diff --git a/ietf/nomcom/factories.py b/ietf/nomcom/factories.py
@@ -84,16 +84,16 @@ class Meta:
     public_key = factory.django.FileField(data=cert)    
 
     @factory.post_generation
-    def populate_positions(self, create, extracted, **kwargs):
+    def populate_positions(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         ''' 
         Create a set of nominees and positions unless NomcomFactory is called
         with populate_positions=False
         '''
         if extracted is None:
             extracted = True
         if create and extracted:
-            nominees = [NomineeFactory(nomcom=self) for i in range(4)]
-            positions = [PositionFactory(nomcom=self) for i in range(3)]
+            nominees = [NomineeFactory(nomcom=obj) for i in range(4)]
+            positions = [PositionFactory(nomcom=obj) for i in range(3)]
 
             def npc(position,nominee,state_id):
                 return NomineePosition.objects.create(position=position,
@@ -108,7 +108,7 @@ def npc(position,nominee,state_id):
             npc(positions[0],nominees[3],'declined')
 
     @factory.post_generation
-    def populate_personnel(self, create, extracted, **kwargs):
+    def populate_personnel(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         '''
         Create a default set of role holders, unless the factory is called
         with populate_personnel=False
@@ -120,7 +120,7 @@ def populate_personnel(self, create, extracted, **kwargs):
             roles = ['chair', 'advisor', 'member']
             for role in roles:
                 p = PersonFactory()
-                self.group.role_set.create(name_id=role,person=p,email=p.email_set.first())
+                obj.group.role_set.create(name_id=role,person=p,email=p.email_set.first())
 
 class PositionFactory(factory.DjangoModelFactory):
     class Meta:
diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py
@@ -75,7 +75,7 @@ def clean(self, value):
 class MultiplePositionNomineeField(forms.MultipleChoiceField, PositionNomineeField):
 
     def clean(self, value):
-        nominees = super(PositionNomineeField, self).clean(value)
+        nominees = super(PositionNomineeField, self).clean(value) # pylint: disable=bad-super-call
         result = []
         for nominee in nominees:
             if not nominee:
diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py
@@ -187,7 +187,7 @@ def save(self, *args, **kwargs):
 
     def get_templates(self):
         if hasattr(self, '_templates'):
-            return self._templates
+            return self._templates      # pylint: disable=access-member-before-definition
         from ietf.dbtemplate.models import DBTemplate
         self._templates = DBTemplate.objects.filter(group=self.nomcom.group).filter(path__contains='/%s/position/' % self.id).order_by('title')
         return self._templates
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
@@ -5,7 +5,7 @@
 import tempfile
 
 from email.header import decode_header
-from email.Iterators import typed_subpart_iterator
+from email.iterators import typed_subpart_iterator
 from email import message_from_string
 
 from django.conf import settings
diff --git a/ietf/person/factories.py b/ietf/person/factories.py
@@ -22,8 +22,8 @@ class Meta:
     username = factory.LazyAttribute(lambda u: u.email)
 
     @factory.post_generation
-    def set_password(self, create, extracted, **kwargs):
-        self.set_password( '%s+password' % self.username )
+    def set_password(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
+        obj.set_password( '%s+password' % obj.username ) # pylint: disable=no-value-for-parameter
 
 class PersonFactory(factory.DjangoModelFactory):
     class Meta:
@@ -39,24 +39,24 @@ class Params:
         )
 
     @factory.post_generation
-    def default_aliases(self, create, extracted, **kwargs):
+    def default_aliases(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         make_alias = getattr(AliasFactory, 'create' if create else 'build')
-        make_alias(person=self,name=self.name)
-        make_alias(person=self,name=self.ascii)
+        make_alias(person=obj,name=obj.name)
+        make_alias(person=obj,name=obj.ascii)
 
     @factory.post_generation
-    def default_emails(self, create, extracted, **kwargs):
+    def default_emails(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         make_email = getattr(EmailFactory, 'create' if create else 'build')
-        make_email(person=self,address=self.user.email)
+        make_email(person=obj,address=obj.user.email)
 
     @factory.post_generation
-    def default_photo(self, create, extracted, **kwargs):
+    def default_photo(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         import atexit
-        if self.biography:
-            photo_name = self.photo_name()
+        if obj.biography:
+            photo_name = obj.photo_name()
             media_name = u"%s/%s.jpg" % (settings.PHOTOS_DIRNAME, photo_name)
-            self.photo = media_name
-            self.photo_thumb = media_name
+            obj.photo = media_name
+            obj.photo_thumb = media_name
             photosrc = os.path.join(settings.TEST_DATA_DIR, "profile-default.jpg")
             photodst = os.path.join(settings.PHOTOS_DIR,  photo_name + '.jpg')
             if not os.path.exists(photodst):
diff --git a/ietf/secr/areas/templatetags/__init__.py b/ietf/secr/areas/templatetags/__init__.py
diff --git a/ietf/secr/areas/templatetags/custom_tags.py b/ietf/secr/areas/templatetags/custom_tags.py
diff --git a/ietf/secr/proceedings/models.py b/ietf/secr/proceedings/models.py
@@ -25,7 +25,7 @@ class Meta:
     def group(self):
         return self.session_set.all()[0].group
 
-    def agenda(self):
+    def agenda(self):                   # pylint: disable=method-hidden
         session = self.session_set.all()[0]
         agendas = session.materials.exclude(states__slug='deleted').filter(type='agenda')
         if agendas:
diff --git a/ietf/secr/rolodex/views.py b/ietf/secr/rolodex/views.py
@@ -73,7 +73,7 @@ def add_proceed(request):
     if request.session['post_data']:
         post_data = request.session['post_data']
     else:
-        messages.error('ERROR: unable to save session data (enable cookies)')
+        messages.error('ERROR: unable to save session data (enable cookies)') # pylint: disable=no-value-for-parameter
         return redirect('rolodex_add')
 
     name = post_data['name']
diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py
@@ -80,7 +80,7 @@ def check_file_txt(self, path):
             else:
                 passed  = False
 
-        item = None
+        item = ""
         for line in message.splitlines():
             if   line[:5] in (errstart + warnstart):
                 item = line.rstrip()
@@ -93,7 +93,7 @@ def check_file_txt(self, path):
                     warnings += 1
                 else:
                     raise RuntimeError("Unexpected state in idnits checker: item: %s, line: %s" % (item, line))
-                item = None
+                item = ""
             elif item and line.strip() != "":
                 item += " " + line.strip()
             else:
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
@@ -1,9 +1,9 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from email.Utils import make_msgid, formatdate, formataddr, parseaddr, getaddresses
-from email.MIMEText import MIMEText
-from email.MIMEMessage import MIMEMessage
-from email.MIMEMultipart import MIMEMultipart
+from email.utils import make_msgid, formatdate, formataddr, parseaddr, getaddresses
+from email.mime.text import MIMEText
+from email.mime.message import MIMEMessage
+from email.mime.multipart import MIMEMultipart
 from email.header import Header
 from email import message_from_string
 from email import charset as Charset
diff --git a/ietf/utils/management/commands/import_htpasswd.py b/ietf/utils/management/commands/import_htpasswd.py
@@ -11,7 +11,7 @@ def import_htpasswd_file(filename, verbosity=1, overwrite=False):
         for line in file:
             if not ':' in line:
                 raise ValueError('Found a line without colon separator in the htpassword file %s:'+
-                    '   "%s"' % (file.name, line))
+                    '   "%s"' % (file.name, line)) # pylint: disable=too-many-format-args
             username, password = line.strip().split(':', 1)
             try:
                 user = User.objects.get(username=username)
@@ -59,4 +59,4 @@ def handle(self, *filenames, **options):
         verbosity = int(options.get('verbosity'))
         for fn in filenames:
             import_htpasswd_file(fn, verbosity=verbosity, overwrite=overwrite)
-                    
+                    
diff --git a/ietf/utils/storage.py b/ietf/utils/storage.py
@@ -2,7 +2,7 @@
 
 class NoLocationMigrationFileSystemStorage(FileSystemStorage):
 
-    def deconstruct(obj):
+    def deconstruct(obj):               # pylint: disable=no-self-argument
         path, args, kwargs = FileSystemStorage.deconstruct(obj)
         kwargs["location"] = None
         return (path, args, kwargs)
