* Silence a test failure that resulted when test_site was run by   regrtest.py after it ran test_frozen.  This test was really only   designed to be run immediately after startup.  Afterwards, other   modules could be loaded when had not been fixed-up by site.py   Took the chicken way out and only tested those modules known to   be imported by site.py.
* Silence a test failure that resulted when test_site was run by
  regrtest.py after it ran test_frozen.  This test was really only
  designed to be run immediately after startup.  Afterwards, other
  modules could be loaded when had not been fixed-up by site.py
  Took the chicken way out and only tested those modules known to
  be imported by site.py.

* Normalized whitespace.

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