Fixed up mypy issues or added type:ignore comments as needed for a clean mypy run.

 - Legacy-Id: 16772

Author: levkowetz

debug.py

@@ -3,10 +3,13 @@
 import sys
 import time as timeutils
 import inspect
+import six
+if six.PY3:
+    from typing import Callable
 
 try:
     import syslog
-    logger = syslog.syslog
+    logger = syslog.syslog              # type: Callable
 except ImportError:                     # import syslog will fail on Windows boxes
     import logging
     logging.basicConfig(filename='tracker.log',level=logging.INFO)
@@ -15,7 +18,7 @@
 try:
     from pprint import pformat
 except ImportError:
-    pformat = lambda x: x
+    pformat = lambda x: x               # type: ignore
 
 import cProfile
 import traceback as tb

ietf/checks.py

@@ -6,9 +6,12 @@
 
 import os
 import patch
+import six
 import sys
 import time
 from textwrap import dedent
+if six.PY3:
+    from typing import List, Tuple      # pyflakes:ignore
 
 import debug                            # pyflakes:ignore
 debug.debug = True
@@ -17,7 +20,7 @@
 from django.core import checks
 from django.utils.module_loading import import_string
 
-checks_run = []
+checks_run = []                         # type: List[str]
 
 def already_ran():
     import inspect

ietf/community/migrations/0001_initial.py

@@ -3,6 +3,10 @@
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 from __future__ import absolute_import, print_function, unicode_literals
 
+import six
+if six.PY3:
+    from typing import List             # pyflakes:ignore
+
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models
@@ -13,7 +17,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-    ]
+    ]                                   # type: List[str]
 
     operations = [
         migrations.CreateModel(

ietf/dbtemplate/migrations/0001_initial.py

@@ -5,6 +5,10 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
+import six
+if six.PY3:
+    from typing import List             # pyflakes:ignore
+
 from django.db import migrations, models
 
 
@@ -13,7 +17,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-    ]
+    ]                                   # type: List[str]
 
     operations = [
         migrations.CreateModel(

ietf/dbtemplate/template.py

@@ -11,7 +11,7 @@
 import debug                            # pyflakes:ignore
 
 from django.template.loaders.base import Loader as BaseLoader
-from django.template.base import Template as DjangoTemplate, TemplateEncodingError
+from django.template.base import Template as DjangoTemplate, TemplateEncodingError # type: ignore (FIXME: remove when Django 2)
 from django.template.exceptions import TemplateDoesNotExist
 from django.utils.encoding import smart_text
 
@@ -95,4 +95,4 @@ def load_template_source(template_name, template_dirs=None):
         PendingDeprecationWarning
     )
     return _loader.load_template_source(template_name, template_dirs)
-load_template_source.is_usable = True
+load_template_source.is_usable = True   # type: ignore # https://github.com/python/mypy/issues/2087

ietf/doc/expire.py

@@ -8,7 +8,10 @@
 from django.conf import settings
 
 import datetime, os, shutil, glob, re
+import six
 from pathlib import Path
+if six.PY3:
+    from typing import List, Tuple      # pyflakes:ignore
 
 from ietf.utils import log
 from ietf.utils.mail import send_mail
@@ -28,7 +31,7 @@ def expirable_draft(draft):
     log.assertion('draft.get_state_slug("draft-iesg")')
     return bool(expirable_drafts(Document.objects.filter(pk=draft.pk)))
 
-nonexpirable_states = []
+nonexpirable_states = []                # type: List[State]
 
 def expirable_drafts(queryset=None):
     """Return a queryset with expirable drafts."""

ietf/doc/factories.py

@@ -7,6 +7,9 @@
 import debug    # pyflakes:ignore
 import factory
 import datetime
+import six
+if six.PY3:
+    from typing import Optional         # pyflakes:ignore
 
 from django.conf import settings
 
@@ -28,7 +31,7 @@ class Meta:
 
     title = factory.Faker('sentence',nb_words=5)
     rev = '00'
-    std_level_id = None
+    std_level_id = None                 # type: Optional[str]
     intended_std_level_id = None
     time = datetime.datetime.now()
     expires = factory.LazyAttribute(lambda o: o.time+datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE))

ietf/doc/feeds.py

@@ -10,7 +10,8 @@
 from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
 from django.urls import reverse as urlreverse
-from django.template.defaultfilters import truncatewords, truncatewords_html, date as datefilter, linebreaks
+from django.template.defaultfilters import truncatewords, truncatewords_html, date as datefilter
+from django.template.defaultfilters import linebreaks # type: ignore
 from django.utils.html import strip_tags
 
 from ietf.doc.models import Document, State, LastCallDocEvent, DocEvent

ietf/doc/views_search.py

@@ -46,7 +46,7 @@
 from django.db.models import Q
 from django.http import Http404, HttpResponseBadRequest, HttpResponse, HttpResponseRedirect, QueryDict
 from django.shortcuts import render
-from django.utils.cache import _generate_cache_key
+from django.utils.cache import _generate_cache_key # type: ignore (FIXME: remove when Django 2)
 
 
 import debug                            # pyflakes:ignore

ietf/doc/views_status_change.py

@@ -8,6 +8,9 @@
 import io
 import os
 import re
+import six
+if six.PY3:
+    from typing import Dict             # pyflakes:ignore
 
 from django import forms
 from django.shortcuts import render, get_object_or_404, redirect
@@ -435,7 +438,7 @@ def clean_helper(form, formtype):
         return cleaned_data
 
 class EditStatusChangeForm(forms.Form):
-    relations={}
+    relations={}                        # type: Dict[str, str]
 
     def __init__(self, *args, **kwargs):
         super(self.__class__, self).__init__(*args, **kwargs)
@@ -452,7 +455,7 @@ class StartStatusChangeForm(forms.Form):
     create_in_state = forms.ModelChoiceField(State.objects.filter(type="statchg", slug__in=("needshep", "adrev")), empty_label=None, required=False)
     notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas.", required=False)
     telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False, widget=forms.Select(attrs={'onchange':'make_bold()'}))
-    relations={}
+    relations={}                        # type: Dict[str, str]
 
     def __init__(self, *args, **kwargs):
         super(self.__class__, self).__init__(*args, **kwargs)