Lint fix.

Author: dhermes

google/auth/_oauth2client.py

@@ -21,19 +21,20 @@
 
 from __future__ import absolute_import
 
+import six
+
 from google.auth import _helpers
 import google.auth.app_engine
 import google.oauth2.credentials
 import google.oauth2.service_account
 
-import six
 try:
     import oauth2client.client
     import oauth2client.contrib.gce
     import oauth2client.service_account
 except ImportError as caught_exc:
-    new_exc = ImportError('oauth2client is not installed.')
-    six.raise_from(new_exc, caught_exc)
+    six.raise_from(
+        ImportError('oauth2client is not installed.'), caught_exc)
 
 try:
     import oauth2client.contrib.appengine

google/auth/transport/grpc.py

@@ -20,10 +20,13 @@
 try:
     import grpc
 except ImportError as caught_exc:  # pragma: NO COVER
-    new_exc = ImportError(
-        'gRPC is not installed, please install the grpcio package to use the '
-        'gRPC transport.')
-    six.raise_from(new_exc, caught_exc)
+    six.raise_from(
+        ImportError(
+            'gRPC is not installed, please install the grpcio package '
+            'to use the gRPC transport.'
+        ),
+        caught_exc,
+    )
 
 
 class AuthMetadataPlugin(grpc.AuthMetadataPlugin):

google/auth/transport/requests.py

@@ -18,15 +18,19 @@
 
 import logging
 
-import six
 try:
     import requests
 except ImportError as caught_exc:  # pragma: NO COVER
-    new_exc = ImportError(
-        'The requests library is not installed, please install the requests '
-        'package to use the requests transport.')
-    six.raise_from(new_exc, caught_exc)
-import requests.exceptions
+    import six
+    six.raise_from(
+        ImportError(
+            'The requests library is not installed, please install the '
+            'requests package to use the requests transport.'
+        ),
+        caught_exc,
+    )
+import requests.exceptions  # pylint: disable=ungrouped-imports
+import six  # pylint: disable=ungrouped-imports
 
 from google.auth import exceptions
 from google.auth import transport

google/auth/transport/urllib3.py

@@ -30,15 +30,19 @@
 except ImportError:  # pragma: NO COVER
     certifi = None
 
-import six
 try:
     import urllib3
 except ImportError as caught_exc:  # pragma: NO COVER
-    new_exc = ImportError(
-        'The urllib3 library is not installed, please install the urllib3 '
-        'package to use the urllib3 transport.')
-    six.raise_from(new_exc, caught_exc)
-import urllib3.exceptions
+    import six
+    six.raise_from(
+        ImportError(
+            'The urllib3 library is not installed, please install the '
+            'urllib3 package to use the urllib3 transport.'
+        ),
+        caught_exc,
+    )
+import six
+import urllib3.exceptions  # pylint: disable=ungrouped-imports
 
 from google.auth import exceptions
 from google.auth import transport

tests/compute_engine/test_credentials.py

@@ -75,7 +75,7 @@ def test_refresh_success(self, get, utcnow):
     def test_refresh_error(self, get):
         get.side_effect = exceptions.TransportError('http error')
 
-        with pytest.raises(exceptions.RefreshError) as excinfo:
+        with pytest.raises(exceptions.RefreshError):
             self.credentials.refresh(None)
 
     @mock.patch('google.auth.compute_engine._metadata.get', autospec=True)