Fix and check cgi module deprecation warnings.  Revert an unwanted rename in test_import.
3 files changed