PEP 3151

Author: bsipocz

astroquery/image_cutouts/first/core.py

@@ -67,7 +67,7 @@ def get_images(self, coordinates, image_size=1 * u.arcmin,
         S = BytesIO(response.content)
         try:
             return fits.open(S, ignore_missing_end=True)
-        except IOError:
+        except OSError:
             raise InvalidQueryError(response.content)
 
     @prepend_docstr_nosections("\n" + _args_to_payload.__doc__)

astroquery/magpis/core.py

@@ -90,7 +90,7 @@ def get_images(self, coordinates, image_size=1 * u.arcmin,
         content_buffer = BytesIO(response.content)
         try:
             return fits.open(content_buffer, ignore_missing_end=True)
-        except IOError:
+        except OSError:
             raise InvalidQueryError(response.content)
 
     @prepend_docstr_nosections("\n" + _args_to_payload.__doc__)

astroquery/nasa_ads/core.py

@@ -123,7 +123,7 @@ def _get_token(self):
             with open(token_file) as f:
                 self.TOKEN = f.read().strip()
             return self.TOKEN
-        except IOError:
+        except OSError:
             raise RuntimeError('No API token found! Get yours from: '
                                'https://ui.adsabs.harvard.edu/#user/settings/token '
                                'and store it in the API_DEV_KEY environment variable.')

astroquery/query.py

@@ -114,7 +114,7 @@ def from_cache(self, cache_location):
                 response = pickle.load(f)
             if not isinstance(response, requests.Response):
                 response = None
-        except IOError:  # TODO: change to FileNotFoundError once drop py2 support
+        except OSError:  # TODO: change to FileNotFoundError once drop py2 support
             response = None
         if response:
             log.debug("Retrieving data from {0}".format(request_file))

astroquery/utils/commons.py

@@ -408,7 +408,7 @@ def save_fits(self, savepath, link_cache='hard'):
         if link_cache == 'hard':
             try:
                 os.link(target, savepath)
-            except (IOError, OSError, AttributeError):
+            except (OSError, AttributeError):
                 shutil.copy(target, savepath)
         elif link_cache == 'sym':
             try:

astroquery/utils/download_file_list.py

@@ -71,7 +71,7 @@ def download_list_of_fitsfiles(linklist, output_directory=None,
         try:
             # try to open as a fits file
             fitsfile = fits.open(S, ignore_missing_end=True)
-        except IOError:
+        except OSError:
             # if that fails, try to open as a gzip'd fits file
             # have to rewind to the start
             S.seek(0)
@@ -117,7 +117,7 @@ def download_list_of_fitsfiles(linklist, output_directory=None,
 
             try:
                 fitsfile.writeto(final_file, clobber=overwrite)
-            except IOError:
+            except OSError:
                 print("Skipped writing file {0} because it exists "
                       "and overwrite=False".format(final_file))
 

astroquery/utils/progressbar.py

@@ -66,7 +66,7 @@ def retrieve(url, outfile, opener=None, overwrite=False):
     S = StringIO(results)
     try:
         fitsfile = fits.open(S, ignore_missing_end=True)
-    except IOError:
+    except OSError:
         S.seek(0)
         G = gzip.GzipFile(fileobj=S)
         fitsfile = fits.open(G, ignore_missing_end=True)

astroquery/vo_conesearch/validator/validate.py

@@ -72,7 +72,7 @@ def check_conesearch_sites(destdir=os.curdir, verbose=True, parallel=True,
 
     Raises
     ------
-    IOError
+    OSError
         Invalid destination directory.
 
     timeout
@@ -87,7 +87,7 @@ def check_conesearch_sites(destdir=os.curdir, verbose=True, parallel=True,
 
     if (not isinstance(destdir, str) or len(destdir) == 0
             or os.path.exists(destdir) and not os.path.isdir(destdir)):
-        raise IOError('Invalid destination directory')  # pragma: no cover
+        raise OSError('Invalid destination directory')  # pragma: no cover
 
     if not os.path.exists(destdir):
         os.mkdir(destdir)