PR: Fix build.

Author: Poogles

google_auth_httplib2.py

@@ -21,12 +21,8 @@
 from google.auth import exceptions
 from google.auth import transport
 import httplib2
+from six.moves import http_client  # httplib became http.client in 3.
 
-# httplib became http.client in 3.x
-try:
-    from http.client import HTTPException
-except ImportError:
-    from httplib import HTTPException
 
 _LOGGER = logging.getLogger(__name__)
 # Properties present in file-like streams / buffers.
@@ -120,9 +116,9 @@ def __call__(self, url, method='GET', body=None, headers=None,
             response, data = self.http.request(
                 url, method=method, body=body, headers=headers, **kwargs)
             return _Response(response, data)
-        # TODO: httplib2 should catch the lower http error, this is a bug and
+        # httplib2 should catch the lower http error, this is a bug and
         # needs to be fixed there.  Catch the error for the meanwhile.
-        except (httplib2.HttpLib2Error, HTTPException) as exc:
+        except (httplib2.HttpLib2Error, http_client.HTTPException) as exc:
             raise exceptions.TransportError(exc)
 
 

setup.py

@@ -20,6 +20,7 @@
 DEPENDENCIES = (
     'google-auth',
     'httplib2 >= 0.9.1',
+    'six'
 )
 
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = lint,py27,py34,py35,py36,pypy,cover
+envlist = lint,py27,py36,cover
 
 [testenv]
 deps =
@@ -21,7 +21,7 @@ deps =
   {[testenv]deps}
 
 [testenv:lint]
-basepython = python3.5
+basepython = python3.6
 commands =
   python setup.py check --metadata --restructuredtext --strict
   flake8 \