review comments

Author: lvalerom

astroquery/esa/hsa/core.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 
 from astropy import units as u
-from ...utils import commons
+from astroquery.utils import commons
 from astroquery import log
 from astroquery.exceptions import LoginError
 from astroquery.query import BaseQuery
@@ -25,7 +25,7 @@ class HSAClass(BaseQuery):
     timeout = conf.TIMEOUT
 
     def __init__(self, tap_handler=None):
-        super(HSAClass, self).__init__()
+        super().__init__()
         if tap_handler is None:
             self._tap = Tap(url=self.metadata_url)
         else:

astroquery/esa/hsa/tests/dummy_handler.py

@@ -21,30 +21,30 @@ def check_method(self, method):
         if method == self._invokedMethod:
             return
         else:
-            raise ValueError("Method '{}' is not invoked. (Invoked method \
-                             is '{}'.)").format(method, self_invokedMethod)
+            raise ValueError("Method '{}' is not invoked. (Invoked method "
+                             "is '{}'.)".format(method, self._invokedMethod))
 
     def check_parameters(self, parameters, method_name):
         if parameters is None:
             return len(self._parameters) == 0
         if len(parameters) != len(self._parameters):
-            raise ValueError("Wrong number of parameters for method '{}'. \
-                              Found: {}. Expected {}").format(
+            raise ValueError("Wrong number of parameters for method '{}'. "
+                             "Found: {}. Expected {}".format(
                                     method_name,
                                     len(self._parameters),
-                                    len(parameters))
+                                    len(parameters)))
         for key in parameters:
             if key in self._parameters:
                 # check value
                 if self._parameters[key] != parameters[key]:
-                    raise ValueError("Wrong '{}' parameter \
-                                     value for method '{}'. \
-                                     Found:'{}'. Expected:'{}'").format(
+                    raise ValueError("Wrong '{}' parameter "
+                                     "value for method '{}'. "
+                                     "Found:'{}'. Expected:'{}'".format(
                                         method_name,
                                         key,
                                         self._parameters[key],
-                                        parameters[key])
+                                        parameters[key]))
             else:
-                raise ValueError("Parameter '%s' not found in method '%s'",
-                                 (str(key), method_name))
+                raise ValueError("Parameter '{}' not found in method '{}'"
+                                 .format(str(key), method_name))
         return True