move ROW_LIMIT to a more general location

Author: keflavich

astroquery/simbad/core.py

@@ -938,7 +938,11 @@ def _get_query_header(self, get_raw=False):
         # if get_raw is set then don't fetch as votable
         if get_raw:
             return ""
-        return "votable {" + ','.join(self.get_votable_fields()) + "}\nvotable open"
+        if self.ROW_LIMIT > 0:
+            RL = "set limit " + str(self.ROW_LIMIT) + "\n"
+        else:
+            RL = ""
+        return RL+"votable {" + ','.join(self.get_votable_fields()) + "}\nvotable open"
 
     def _get_query_footer(self, get_raw=False):
         return "" if get_raw else "votable close"
@@ -960,8 +964,6 @@ def _args_to_payload(self, *args, **kwargs):
         votable_header = self._get_query_header(get_raw)
         votable_footer = self._get_query_footer(get_raw)
 
-        if self.ROW_LIMIT > 0:
-            script = "set limit " + str(self.ROW_LIMIT)
         script = "\n".join([script, votable_header, command])
         using_wildcard = False
         if kwargs.get('wildcard'):

astroquery/simbad/tests/test_simbad_remote.py

@@ -101,6 +101,7 @@ def test_query_region_async(self, temp_dir):
         simbad = Simbad()
         # TODO: rewise once ROW_LIMIT is working
         simbad.TIMEOUT = 100
+        simbad.ROW_LIMIT = 100
         simbad.cache_location = temp_dir
         response = simbad.query_region_async(
             ICRS_COORDS_M42, radius=2 * u.deg, equinox=2000.0, epoch='J2000')