Geoffrey Gerrietts discovered that a KeyError was caught that probably should have been a NameError.  I'm checking in a change that catches both, just to be sure -- I can't be bothered trying to understand this code any more. :-)
Geoffrey Gerrietts discovered that a KeyError was caught that probably
should have been a NameError.  I'm checking in a change that catches
both, just to be sure -- I can't be bothered trying to understand this
code any more. :-)

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator