Test updates to get passes in multiple versions.

* httplib -> http.client when python3
* dictionary comprehension to list comprehension inside dict() for 2.6