Bug: Catch any underlying exceptions from http.HTTPException (#7)

* Bug: Catch any underlying exceptions from http.HTTPException

Resolves https://github.com/GoogleCloudPlatform/google-auth-library-
         python-httplib2/issues/6

* PR: Fix build.

* Remove unneeded comment.

Author: Poogles

google_auth_httplib2.py

@@ -21,6 +21,7 @@
 from google.auth import exceptions
 from google.auth import transport
 import httplib2
+from six.moves import http_client
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -115,7 +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)
-        except httplib2.HttpLib2Error as exc:
+        # 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, http_client.HTTPException) as exc:
             raise exceptions.TransportError(exc)
 
 

setup.py

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