this time really fix the problem & add a regression test

Author: keflavich

astroquery/splatalogue/core.py

@@ -8,6 +8,7 @@
 import warnings
 from astropy.io import ascii
 from astropy import units as u
+from astropy import log
 from ..query import BaseQuery
 from ..utils import async_to_sync
 from ..utils.docstr_chompers import prepend_docstr_noreturns
@@ -294,9 +295,11 @@ def _parse_kwargs(self, min_frequency=None, max_frequency=None,
                              "are {vers}".format(vers=str(self.versions)))
 
         if exclude == 'none':
+            log.debug("Exclude is 'none'")
             for e in ('potential', 'atmospheric', 'probable', 'known'):
-                if 'no_'+e in payload:
-                    del payload['no_' + e]
+                # Setting a keyword value to 'None' removes it (see query_lines_async)
+                log.debug("Setting no_{0} to None".format(e))
+                payload['no_' + e] = None
         elif exclude is not None:
             for e in exclude:
                 payload['no_' + e] = 'no_' + e
@@ -389,6 +392,9 @@ def query_lines_async(self, min_frequency=None, max_frequency=None,
                                                    max_frequency=max_frequency,
                                                    **kwargs))
 
+        # Add an extra step: sometimes, need to REMOVE keywords
+        data_payload = {k:v for k,v in data_payload.items() if v is not None}
+
         if get_query_payload:
             return data_payload
 

astroquery/splatalogue/tests/test_splatalogue.py

@@ -3,6 +3,7 @@
 from ...utils.testing_tools import MockResponse
 from astropy import units as u
 from astropy.tests.helper import pytest, remote_data
+from astropy.extern.six.moves import urllib_parse
 import requests
 import os
 
@@ -112,7 +113,33 @@ def test_band_crashorno():
 @remote_data
 def test_version_selection():
     results = splatalogue.Splatalogue.query_lines(
-        min_frequency=703 * u.GHz, max_frequency=706 * u.GHz,
-        chemical_name='Acetaldehyde', version='v1.0')
-
-    assert len(results) == 133
+			    min_frequency= 703*u.GHz,
+			    max_frequency=706*u.GHz,
+			    chemical_name='Acetaldehyde',
+			    version='v1.0'
+			    )
+    assert len(results)==1
+
+def test_exclude(patch_post):
+    # regression test for issue 616
+    d = splatalogue.Splatalogue.query_lines_async(114 * u.GHz, 116 * u.GHz,
+                                                  chemical_name=' CO ',
+                                                  get_query_payload=True)
+
+    exclusions = {'no_atmospheric': 'no_atmospheric',
+                  'no_potential': 'no_potential',
+                  'no_probable': 'no_probable',}
+
+    for k,v in exclusions.items():
+        assert d[k] == v
+
+    d = splatalogue.Splatalogue.query_lines_async(114 * u.GHz, 116 * u.GHz,
+                                                  chemical_name=' CO ',
+                                                  exclude='none',
+                                                  get_query_payload=True)
+
+    for k,v in exclusions.items():
+        assert k not in d
+
+    for k in d:
+        assert k[:3] != 'no_'