Whoops!  We just discovered that Gordon's revamp of this module was accidentally wiped out by Ping's patch (which shouldn't have affected this file at all, had Ping done a cvs update).
Whoops!  We just discovered that Gordon's revamp of this module was
accidentally wiped out by Ping's patch (which shouldn't have affected
this file at all, had Ping done a cvs update).

This checkin restores Gordon's version, with Fredrik's change merged
back in.

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