INTEGRALSWRQ-158: pycodestyle fixes

Author: jespinosaar

astroquery/esa/integral/core.py

@@ -482,7 +482,7 @@ def get_long_term_timeseries(self, target_name, *, instrument=None, band=None, p
             request_result = esautils.execute_servlet_request(url=conf.ISLA_SERVLET,
                                                               tap=self.tap,
                                                               query_params=query_params)
-            if not 'detectors' in request_result or len(request_result['detectors']) == 0:
+            if 'detectors' not in request_result or len(request_result['detectors']) == 0:
                 raise ValueError('Please try with different input parameters.')
             # Parse the long term timeseries
             source_id = request_result['sourceId']
@@ -587,7 +587,7 @@ def get_short_term_timeseries(self, target_name, epoch, instrument=None, band=No
                                                               tap=self.tap,
                                                               query_params=query_params)
 
-            if not 'detectors' in request_result or len(request_result['detectors']) == 0:
+            if 'detectors' not in request_result or len(request_result['detectors']) == 0:
                 raise ValueError('Please try with different input parameters.')
 
             # Parse the short term timeseries
@@ -982,7 +982,7 @@ def __validate_epoch(self, epoch, *, target_name=None, instrument=None, band=Non
         """
         available_epochs = self.get_epochs(target_name=target_name, instrument=instrument, band=band)
 
-        if not epoch in available_epochs['epoch']:
+        if epoch not in available_epochs['epoch']:
             raise ValueError(f"Epoch {epoch} is not available for this target and instrument/band.")
 
     def __get_science_window_parameter(self, science_windows, observation_id, revolution, proposal):

astroquery/esa/integral/tests/test_isla_tap.py

@@ -9,13 +9,11 @@
 
 """
 from astropy.coordinates import SkyCoord
-from astropy.io.votable.tree import VOTableFile
-from astropy.table import Table
+
 from astroquery.esa.integral import IntegralClass
 from astroquery.esa.integral import conf
-from unittest.mock import MagicMock, PropertyMock, patch, Mock
+from unittest.mock import PropertyMock, patch, Mock
 import pytest
-from pyvo.dal import DALResults
 
 from requests import HTTPError
 

astroquery/esa/utils/utils.py

@@ -9,26 +9,17 @@
 """
 import getpass
 import os
-from urllib.parse import urlparse
 
 import numpy as np
-import requests
 from astropy import log
 from astropy.coordinates import SkyCoord
-from astropy import units
-from astropy.table import Table
 
 from astropy.units import Quantity
-from astroquery.exceptions import RemoteServiceError
-from astroquery.ipac.ned import Ned
-from astroquery.simbad import Simbad
-from astroquery.vizier import Vizier
 from pyvo.auth.authsession import AuthSession
 from astroquery.utils import commons
 
 import matplotlib.pyplot as plt
 from requests import Response
-import json
 
 
 TARGET_RESOLVERS = ['ALL', 'SIMBAD', 'NED', 'VIZIER']
@@ -238,7 +229,7 @@ def execute_servlet_request(url, tap, *, query_params=None):
     The request with the modified url
     """
 
-    if not 'TAPCLIENT' in query_params:
+    if 'TAPCLIENT' not in query_params:
         query_params['TAPCLIENT'] = 'ASTROQUERY'
 
     # Use the TAPService session to perform a custom GET request
@@ -410,7 +401,7 @@ def download_file(url, session, *, filename=None, params=None, verbose=False):
     The request with the modified url
     """
 
-    if not 'TAPCLIENT' in params:
+    if 'TAPCLIENT' not in params:
         params['TAPCLIENT'] = 'ASTROQUERY'
 
     with session.get(url, stream=True, params=params) as response:
@@ -497,4 +488,4 @@ def resolve_target(url, session, target_name, target_resolver):
                 dec = target_result['objects'][0]['decDegrees']
             return SkyCoord(ra=ra, dec=dec, unit="deg")
         except (ValueError, KeyError):
-            raise ValueError("This target cannot be resolved")
+            raise ValueError("This target cannot be resolved")