fix ALMA utility tests and warning checkers to handle byte type indices

and log.warning not raising real warnings

Author: keflavich

astroquery/alma/tests/test_alma_remote.py

@@ -78,11 +78,13 @@ def test_m83(self, temp_dir, recwarn):
         #assert ex.value.args[0] == ('Received an error 405: this may indicate you have '
         #                            'already staged the data.  Try downloading the '
         #                            'file URLs directly with download_files.')
-        link_list = alma.stage_data(uids)
-        w = recwarn.pop()
-        assert (str(w.message) == ('Error 405 received.  If you have previously staged the '
-                                   'same UIDs, the result returned is probably correct,'
-                                   ' otherwise you may need to create a fresh astroquery.Alma instance.'))
+
+        # log.warning doesn't actually make a warning
+        #link_list = alma.stage_data(uids)
+        #w = recwarn.pop()
+        #assert (str(w.message) == ('Error 405 received.  If you have previously staged the '
+        #                           'same UIDs, the result returned is probably correct,'
+        #                           ' otherwise you may need to create a fresh astroquery.Alma instance.'))
 
     def test_stage_data(self, temp_dir, recwarn):
         alma = Alma()
@@ -110,11 +112,13 @@ def test_stage_data(self, temp_dir, recwarn):
         #assert ex.value.args[0] == ('Received an error 405: this may indicate you have '
         #                            'already staged the data.  Try downloading the '
         #                            'file URLs directly with download_files.')
-        result = alma.stage_data([uid])
-        w = recwarn.pop()
-        assert (str(w.message) == ('Error 405 received.  If you have previously staged the '
-                                   'same UIDs, the result returned is probably correct,'
-                                   ' otherwise you may need to create a fresh astroquery.Alma instance.'))
+
+        # log.warning doesn't actually make a warning
+        #result = alma.stage_data([uid])
+        #w = recwarn.pop()
+        #assert (str(w.message) == ('Error 405 received.  If you have previously staged the '
+        #                           'same UIDs, the result returned is probably correct,'
+        #                           ' otherwise you may need to create a fresh astroquery.Alma instance.'))
 
 
     def test_doc_example(self, temp_dir):

astroquery/alma/tests/test_alma_utils.py

@@ -70,7 +70,12 @@ def test_make_finder_chart():
                                      'Eta Carinae')
     image, catalog, hit_mask_public, hit_mask_private = result
 
-    assert len(catalog) >= 7
-    assert 3 in hit_mask_public
+    assert len(catalog) >= 6 # down to 6 on Nov 17, 2016
+    assert 3 in [int(x) for x in hit_mask_public]
     # Feb 8 2016: apparently the 60s integration hasn't actually been released yet...
-    assert hit_mask_public[3][256,256] >= 30.23
+    if 3 in hit_mask_public:
+        assert hit_mask_public[3][256,256] >= 30.23
+    elif b'3' in hit_mask_public:
+        assert hit_mask_public[b'3'][256,256] >= 30.23
+    else:
+        raise ValueError("hit_mask keys are not of any known type")

astroquery/alma/utils.py

@@ -441,13 +441,13 @@ def make_finder_chart_from_image_and_catalog(image, catalog, save_prefix,
             fig.show_contour(fits.PrimaryHDU(data=hit_mask_public[band],
                                              header=image.header),
                              levels=integration_time_contour_levels,
-                             colors=[band_colors_pub[band]] * len(integration_time_contour_levels),
+                             colors=[band_colors_pub[int(band)]] * len(integration_time_contour_levels),
                              convention='calabretta')
         if band in hit_mask_private:
             fig.show_contour(fits.PrimaryHDU(data=hit_mask_private[band],
                                              header=image.header),
                              levels=integration_time_contour_levels,
-                             colors=[band_colors_priv[band]] * len(integration_time_contour_levels),
+                             colors=[band_colors_priv[int(band)]] * len(integration_time_contour_levels),
                              convention='calabretta')
 
     fig.save('{0}_almafinderchart.png'.format(save_prefix))