Fix list handling in Vizier.

Author: jwoillez

astroquery/vizier/core.py

@@ -357,19 +357,20 @@ def query_region_async(self, coordinates, radius=None, inner_radius=None,
         catalog = VizierClass._schema_catalog.validate(catalog)
         center = {}
         columns = []
+
+        # Process coordinates
         if isinstance(coordinates, (commons.CoordClasses,) + six.string_types):
             c = commons.parse_coordinates(coordinates).transform_to('fk5')
 
             if not c.isscalar:
-                pos_list = []
+                center["-c"] = []
                 for pos in c:
                     ra_deg = pos.ra.to_string(unit="deg", decimal=True,
                                               precision=8)
                     dec_deg = pos.dec.to_string(unit="deg", decimal=True,
                                                 precision=8, alwayssign=True)
-                    pos_list += ["{}{}".format(ra_deg, dec_deg)]
-                center["-c"] = "<<;" + ";".join(pos_list)
-                columns += ["_q"]  # request a reference to the input table
+                    center["-c"] += ["{}{}".format(ra_deg, dec_deg)]
+                columns += ["_q"]  # Always request reference to input table
             else:
                 ra = c.ra.to_string(unit='deg', decimal=True, precision=8)
                 dec = c.dec.to_string(unit="deg", decimal=True, precision=8,
@@ -378,7 +379,7 @@ def query_region_async(self, coordinates, radius=None, inner_radius=None,
         elif isinstance(coordinates, tbl.Table):
             if (("_RAJ2000" in coordinates.keys()) and ("_DEJ2000" in
                                                         coordinates.keys())):
-                pos_list = []
+                center["-c"] = []
                 sky_coord = coord.SkyCoord(coordinates["_RAJ2000"],
                                            coordinates["_DEJ2000"],
                                            unit=(coordinates["_RAJ2000"].unit,
@@ -388,15 +389,15 @@ def query_region_async(self, coordinates, radius=None, inner_radius=None,
                                           precision=8)
                     dec_deg = dec.to_string(unit="deg", decimal=True,
                                             precision=8, alwayssign=True)
-                    pos_list += ["{}{}".format(ra_deg, dec_deg)]
-                center["-c"] = "<<;" + ";".join(pos_list)
-                columns += ["_q"]  # request a reference to the input table
+                    center["-c"] += ["{}{}".format(ra_deg, dec_deg)]
+                columns += ["_q"]  # Always request reference to input table
             else:
                 raise ValueError("Table must contain '_RAJ2000' and "
                                  "'_DEJ2000' columns!")
         else:
             raise TypeError("Coordinates must be one of: string, astropy "
                             "coordinates, or table containing coordinates!")
+
         # decide whether box or radius
         if radius is not None:
             # is radius a disk or an annulus?
@@ -434,6 +435,7 @@ def query_region_async(self, coordinates, radius=None, inner_radius=None,
             raise Exception(
                 "At least one of radius, width/height must be specified")
 
+        # Prepare payload
         data_payload = self._args_to_payload(center=center, columns=columns,
                                              catalog=catalog, column_filters=column_filters)
 
@@ -607,13 +609,22 @@ def _args_to_payload(self, *args, **kwargs):
         if ucd:
             body['-ucd'] = ucd
 
-        # create final script
-        script = "\n".join(["{key}={val}".format(key=key, val=val)
-                            for key, val in body.items()])
-        # add keywords
+        # create final script starting with keywords
+        script = ""
         if (not isinstance(self.keywords, property) and
                 self.keywords is not None):
             script += "\n" + str(self.keywords)
+        # add all items that are not lists
+        for key, val in body.items():
+            if type(val) is not list:
+                script += "\n{key}={val}".format(key=key, val=val)
+        # add list at the end
+        for key, val in body.items():
+            if type(val) is list:
+                script += "\n{key}=<<====AstroqueryList".format(key=key)
+                script += "\n" + "\n".join(val)
+                script += "\n====AstroqueryList"                       
+        # add keywords
         return script
 
     def _parse_result(self, response, get_catalog_names=False, verbose=False,