diff --git a/vladiate/inputs.py b/vladiate/inputs.py index c86b26c..b7caccc 100644 --- a/vladiate/inputs.py +++ b/vladiate/inputs.py @@ -1,11 +1,11 @@ import io try: from urlparse import urlparse -except: +except ImportError: from urllib.parse import urlparse try: from StringIO import StringIO -except: +except ImportError: from io import StringIO from vladiate.exceptions import MissingExtraException @@ -45,7 +45,7 @@ def __init__(self, path=None, bucket=None, key=None): try: import boto # noqa self.boto = boto - except: + except ImportError: # 2.7 workaround, should just be `raise Exception() from None` exc = MissingExtraException() exc.__context__ = None diff --git a/vladiate/main.py b/vladiate/main.py index 6a16d7d..988bd8e 100644 --- a/vladiate/main.py +++ b/vladiate/main.py @@ -1,6 +1,6 @@ try: from Queue import Empty -except: +except ImportError: from queue import Empty from multiprocessing import Pool, Queue from vladiate import Vlad diff --git a/vladiate/test/test_inputs.py b/vladiate/test/test_inputs.py index b2aa700..ce4df23 100644 --- a/vladiate/test/test_inputs.py +++ b/vladiate/test/test_inputs.py @@ -9,7 +9,7 @@ def mock_boto(result): try: import builtins - except: + except ImportError: import __builtin__ as builtins realimport = builtins.__import__ diff --git a/vladiate/test/test_main.py b/vladiate/test/test_main.py index 21cb37a..0d6c182 100644 --- a/vladiate/test/test_main.py +++ b/vladiate/test/test_main.py @@ -86,7 +86,7 @@ def test_run(monkeypatch): monkeypatch.setattr('vladiate.main.main', main) try: monkeypatch.setattr('__builtin__.exit', exit) - except: + except ImportError: monkeypatch.setattr('builtins.exit', exit) run('__main__')