merge from 3.2.  Minor code style improvements in http.server suggested in Issue13294.
merge from 3.2.  Minor code style improvements in http.server suggested in Issue13294.

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