aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Citro <craigcitro@gmail.com>2017-03-27 09:39:27 -0700
committerJon Wayne Parrott <jonwayne@google.com>2017-03-27 09:39:27 -0700
commita3cf56b659e067dea8ead933f81e4a6f42d30ed8 (patch)
treed47b704b34b54fb9db38cbab9f2ab4b0cfb5e7e8
parentc055e7f7f5b7f7f9fe8ba12bbf7e297fccc2b59b (diff)
downloadoauth2client-a3cf56b659e067dea8ead933f81e4a6f42d30ed8.tar.gz
Make `tox -e flake8` pass. (#705)
This library is in maintenance mode, but no reason to leave travis broken. Two disables and a better `except` in a test and it's green again.
-rw-r--r--tests/test_file.py2
-rw-r--r--tox.ini4
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/test_file.py b/tests/test_file.py
index a443035..80324d6 100644
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -38,7 +38,7 @@ from tests import http_mock
try:
# Python2
from future_builtins import oct
-except: # pragma: NO COVER
+except ImportError: # pragma: NO COVER
pass
_filehandle, FILENAME = tempfile.mkstemp('oauth2client_test.data')
diff --git a/tox.ini b/tox.ini
index 961a580..5fea4fc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -110,3 +110,7 @@ putty-ignore =
# Ignore lines over 80 chars that include "http:" or "https:"
/http:/ : E501
/https:/ : E501
+ # E722 do not use bare except
+ # Existing sloppy usages.
+ oauth2client/crypt.py : E722
+ oauth2client/contrib/multiprocess_file_storage.py : E722