removing extra try..except from imports, only keyring import needs to be checked

Author: bsipocz

astroquery/cosmosim/tests/test_cosmosim_remote.py

@@ -3,22 +3,21 @@
 import tempfile
 import shutil
 from astropy.tests.helper import pytest, remote_data
+from ...exceptions import LoginError
+
 try:
     import keyring
     HAS_KEYRING = True
 except ImportError:
     HAS_KEYRING = False
-try:
+
+if HAS_KEYRING:
     from ...cosmosim import CosmoSim
-    COSMOSIM_IMPORTED = True
-except ImportError:
-    COSMOSIM_IMPORTED = False
-from ...exceptions import LoginError
 
-SKIP_TESTS = not(HAS_KEYRING and COSMOSIM_IMPORTED)
+SKIP_TESTS = not HAS_KEYRING
 
 #@pytest.mark.skipif('SKIP_TESTS')
 #@remote_data
 #class TestEso:
 #    def __init__():
-        
+

astroquery/eso/tests/test_eso.py

@@ -1,16 +1,19 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 import os
-from distutils.version import LooseVersion
-import astropy
-try:
-    from ...eso import Eso
-    ESO_IMPORTED = True
-except ImportError:
-    ESO_IMPORTED = False
 from astropy.tests.helper import pytest
 from ...utils.testing_tools import MockResponse
 
-SKIP_TESTS = not ESO_IMPORTED
+# keyring is an optional dependency required by the eso module.
+try:
+    import keyring
+    HAS_KEYRING = True
+except ImportError:
+    HAS_KEYRING = False
+
+if HAS_KEYRING:
+    from ...eso import Eso
+
+SKIP_TESTS = not HAS_KEYRING
 
 DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -22,12 +25,12 @@ def data_path(filename):
                       'amber_form.html',
                       'http://archive.eso.org/wdb/wdb/adp/phase3_main/form':
                       'vvv_sgra_form.html',
-                     },
+                      },
               'POST': {'http://archive.eso.org/wdb/wdb/eso/amber/query':
                        'amber_sgra_query.tbl',
                        'http://archive.eso.org/wdb/wdb/adp/phase3_main/query':
                        'vvv_sgra_survey_response.tbl',
-                      }
+                       }
               }
 
 
@@ -64,6 +67,7 @@ def test_SgrAstar(monkeypatch):
     assert len(result) == 50
     assert 'GC_IRS7' in result['Object']
 
+
 @pytest.mark.skipif('SKIP_TESTS')
 def test_vvv(monkeypatch):
     eso = Eso()

astroquery/eso/tests/test_eso_remote.py

@@ -2,19 +2,19 @@
 import tempfile
 import shutil
 from astropy.tests.helper import pytest, remote_data
+from ...exceptions import LoginError
+
+# keyring is an optional dependency required by the eso module.
 try:
     import keyring
     HAS_KEYRING = True
 except ImportError:
     HAS_KEYRING = False
-try:
+
+if HAS_KEYRING:
     from ...eso import Eso
-    ESO_IMPORTED = True
-except ImportError:
-    ESO_IMPORTED = False
-from ...exceptions import LoginError
 
-SKIP_TESTS = not(HAS_KEYRING and ESO_IMPORTED)
+SKIP_TESTS = not HAS_KEYRING
 
 instrument_list = [u'fors1', u'fors2', u'sphere', u'vimos', u'omegacam',
                    u'hawki', u'isaac', u'naco', u'visir', u'vircam', u'apex',