PR Fixes

Undo PEP8 changes, will submit a separate PR for them.
Use frozenset for DEFAULT_HTTPS_PORTS.