fix dr8, dr9 peculiarities

Author: weaverba137

astroquery/sdss/core.py

@@ -583,15 +583,16 @@ def get_spectra_async(self, coordinates=None, radius=2. * u.arcsec,
             # - run2d sometimes (#739)
             if isinstance(row['run2d'], bytes):
                 run2d = row['run2d'].decode()
+            elif isinstance(row['run2d'], (np.integer, int)):
+                run2d = str(run2d)
             else:
                 run2d = row['run2d']
             if data_release > 15 and run2d not in ('26', '103', '104'):
-                linkstr.replace('/spectra/', '/spectra/full/')
+                linkstr = linkstr.replace('/spectra/', '/spectra/full/')
             link = linkstr.format(
                 base=conf.sas_baseurl, dr=data_release,
                 run2d=run2d, plate=row['plate'],
                 fiber=row['fiberID'], mjd=row['mjd'])
-
             results.append(commons.FileContainer(link,
                                                  encoding='binary',
                                                  remote_timeout=timeout,
@@ -860,9 +861,12 @@ def _parse_result(self, response, verbose=False):
 
         if 'error_message' in io.BytesIO(response.content):
             raise RemoteServiceError(response.content)
+        skip_header = 0
+        if response.content.startswith('#Table'):
+            skip_header = 1
         arr = np.atleast_1d(np.genfromtxt(io.BytesIO(response.content),
                                           names=True, dtype=None,
-                                          delimiter=',', skip_header=1,
+                                          delimiter=',', skip_header=skip_header,
                                           comments='#'))
 
         if len(arr) == 0:

astroquery/sdss/field_names.py

@@ -16,8 +16,7 @@
 
 # Default photometric and spectroscopic quantities to retrieve.
 photoobj_defs = ['ra', 'dec', 'objid', 'run', 'rerun', 'camcol', 'field']
-specobj_defs = ['z', 'plate', 'mjd', 'fiberID', 'specobjid', 'run2d',
-                'instrument']
+specobj_defs = ['z', 'plate', 'mjd', 'fiberID', 'specobjid', 'run2d']
 crossid_defs = ['ra', 'dec', 'psfMag_u', 'psfMagerr_u', 'psfMag_g',
                 'psfMagerr_g', 'psfMag_r', 'psfMagerr_r', 'psfMag_i',
                 'psfMagerr_i', 'psfMag_z', 'psfMagerr_z']