Style fixes

Author: “Javier

astroquery/esa/jwst/core.py

@@ -78,7 +78,8 @@ def __init__(self, tap_plus_handler=None, data_handler=None):
             self.__jwsttap = tap_plus_handler
 
         if data_handler is None:
-            self.__jwstdata = JwstDataHandler(base_url="http://jwstdummydata.com")
+            self.__jwstdata = JwstDataHandler(
+                base_url="http://jwstdummydata.com")
             # self.__jwstdata = self.__jwsttap;
         else:
             self.__jwstdata = data_handler
@@ -1036,7 +1037,7 @@ def set_token(self, token):
         subcontext = 'session'
         data = 'action=set&key=mast_token&value=' + token
         self.__jwsttap._TapPlus__getconnhandler().execute_tappost(subcontext,
-                                                              data)
+                                                                  data)
 
     def get_product_list(self, observation_id=None,
                          cal_level="ALL",
@@ -1121,7 +1122,8 @@ def _get_plane_id(self, observation_id):
             max_cal_level = job.get_results()["calibrationlevel"][0]
             for row in job.get_results():
                 if(row["calibrationlevel"] == max_cal_level):
-                    planeids.append(JwstClass.get_decoded_string(row["planeid"]))
+                    planeids.append(
+                        JwstClass.get_decoded_string(row["planeid"]))
             return planeids, max_cal_level
         except Exception as e:
             raise ValueError("This observation_id does not exist in "
@@ -1205,7 +1207,8 @@ def get_related_observations(self, observation_id):
             query_members = "select m.members from {} m where m.observationid"\
                       "='{}'".format(self.JWST_MAIN_TABLE, observation_id)
             job = self.__jwsttap.launch_job(query=query_members)
-            oids = JwstClass.get_decoded_string(job.get_results()["members"][0]).\
+            oids = JwstClass.get_decoded_string(
+                job.get_results()["members"][0]).\
                 replace("caom:JWST/", "").split(" ")
         return oids
 
@@ -1266,12 +1269,14 @@ def _query_get_product(self, artifact_id=None, file_name=None):
             query_artifactid = "select * from {} a where a.filename = "\
                 "'{}'".format(self.JWST_ARTIFACT_TABLE, file_name)
             job = self.__jwsttap.launch_job(query=query_artifactid)
-            return JwstClass.get_decoded_string(job.get_results()['artifactid'][0])
+            return JwstClass.get_decoded_string(
+                job.get_results()['artifactid'][0])
         else:
             query_filename = "select * from {} a where a.artifactid = "\
                 "'{}'".format(self.JWST_ARTIFACT_TABLE, artifact_id)
             job = self.__jwsttap.launch_job(query=query_filename)
-            return JwstClass.get_decoded_string(job.get_results()['filename'][0])
+            return JwstClass.get_decoded_string(
+                job.get_results()['filename'][0])
 
     def __check_product_input(self, artifact_id, file_name):
         if artifact_id is None and file_name is None:
@@ -1572,7 +1577,7 @@ def get_decoded_string(str):
         try:
             return str.decode('utf-8')
             # return str
-        except:
+        except (UnicodeDecodeError, AttributeError):
             return str
 
 

astroquery/esa/jwst/tests/test_jwst_e2e.py

@@ -335,11 +335,11 @@ def test_query_target_name(self):
         target_name = 'LMC'
         target_resolver = 'SIMBAD'
         t = jwst.query_target(target_name,
-                                target_resolver,
-                                width,
-                                height,
-                                filter_name='F277W',
-                                cal_level=1)
+                              target_resolver,
+                              width,
+                              height,
+                              filter_name='F277W',
+                              cal_level=1)
         filter_index = t.colnames.index('energy_bandpassname')
         assert('F277W' in t[0][filter_index].decode('UTF-8'))
 

astroquery/esa/jwst/token.py

@@ -124,9 +124,11 @@ def __create_content(self):
         self.__tokenEntry.grid(row=row, column=2, columnspan=2, padx=5, pady=5)
 
         row = row+1
-        cancelButton = TKButton(self.__top, text='Cancel', command=self.__cancel_action)
+        cancelButton = TKButton(self.__top, text='Cancel',
+                                command=self.__cancel_action)
         cancelButton.grid(row=row, column=1, padx=5, pady=5)
-        loginButton = TKButton(self.__top, text='Login', command=self.__login_action)
+        loginButton = TKButton(self.__top, text='Login',
+                               command=self.__login_action)
         loginButton.grid(row=row, column=2, padx=5, pady=5)
 
     def show_login(self):