httplib import error on python3

When trying to use the latest 2.38.1 selenium with python3 I got some errors which I figured out where inadvertently removed, some clean-up was suggested by PyCharm (IDE). I have signed the CLA
 
- httplib import error on python3
- formatting/pep-8 fixes