{Misc} Replace aliased errors with OSError (#30447)

Author: atombrella

scripts/curl_install_pypi/install.py

@@ -204,7 +204,7 @@ def _backup_rc(rc_file):
     try:
         shutil.copyfile(rc_file, rc_file+'.backup')
         print_status("Backed up '{}' to '{}'".format(rc_file, rc_file+'.backup'))
-    except (OSError, IOError):
+    except OSError:
         pass
 
 
@@ -233,7 +233,7 @@ def _find_line_in_file(file_path, search_pattern):
             for line in search_file:
                 if search_pattern in line:
                     return True
-    except (OSError, IOError):
+    except OSError:
         pass
     return False
 

src/azure-cli-core/azure/cli/core/_session.py

@@ -36,7 +36,7 @@ def load(self, filename, max_age=0):
                     self.save()
             with open(self.filename, 'r', encoding=self._encoding) as f:
                 self.data = json.load(f)
-        except (OSError, IOError, json.JSONDecodeError) as load_exception:
+        except (OSError, json.JSONDecodeError) as load_exception:
             # OSError / IOError should imply file not found issues which are expected on fresh runs (e.g. on build
             # agents or new systems). A parse error indicates invalid/bad data in the file. We do not wish to warn
             # on missing files since we expect that, but do if the data isn't parsing as expected.

src/azure-cli-core/azure/cli/core/commands/__init__.py

@@ -95,7 +95,7 @@ def _maybe_load_file(arg):
         if ix == 0:
             try:
                 return _load_file(poss_file)
-            except IOError:
+            except OSError:
                 logger.debug("Failed to load '%s', assume not a file", arg)
                 return arg
 
@@ -471,7 +471,7 @@ def _put_operation():
     obj_path = os.path.join(obj_dir, obj_file)
     try:
         os.remove(obj_path)
-    except (OSError, IOError):  # FileNotFoundError introduced in Python 3
+    except OSError:  # FileNotFoundError introduced in Python 3
         pass
     return result
 

src/azure-cli-core/azure/cli/core/keys.py

@@ -48,7 +48,7 @@ def generate_ssh_keys(private_key_filepath, public_key_filepath):
                                public_key_filepath, pub_ssh_dir)
 
                 return public_key
-        except IOError as e:
+        except OSError as e:
             raise CLIError(e)
 
     ssh_dir = os.path.dirname(private_key_filepath)

src/azure-cli-core/azure/cli/core/tests/test_keys.py

@@ -64,7 +64,7 @@ def test_error_raised_when_public_key_file_exists_IOError(self):
         with mock.patch('azure.cli.core.keys.open') as mocked_open:
             # mock failed call to read
             mocked_f = mocked_open.return_value.__enter__.return_value
-            mocked_f.read = mock.MagicMock(side_effect=IOError("Mocked IOError"))
+            mocked_f.read = mock.MagicMock(side_effect=OSError("Mocked IOError"))
 
             # assert that CLIError raised when generate_ssh_keys is called
             with self.assertRaises(CLIError):

src/azure-cli-telemetry/azure/cli/telemetry/__init__.py

@@ -106,7 +106,7 @@ def main():
             # another upload process is running.
             logger.info('Lock out from note file under %s which means another process is running. Exit 0.', config_dir)
             sys.exit(0)
-        except IOError as err:
+        except OSError as err:
             logger.warning('Unexpected IO Error %s. Exit 1.', err)
             sys.exit(1)
         except Exception as err:  # pylint: disable=broad-except

src/azure-cli-telemetry/azure/cli/telemetry/components/records_collection.py

@@ -51,7 +51,7 @@ def _read_file(self, path):
                     self._add_record(line)
 
                 self._logger.info("Processed file %s into %d records.", path, len(self._records))
-        except IOError as err:
+        except OSError as err:
             self._logger.warning("Fail to open file %s. Reason: %s.", path, err)
 
     def _add_record(self, content_line):

src/azure-cli-telemetry/azure/cli/telemetry/components/telemetry_logging.py

@@ -45,5 +45,5 @@ def _ensure_telemetry_log_folder(config_dir):
         if not os.path.isdir(ret):
             os.makedirs(ret)
         return ret
-    except (OSError, IOError, TypeError):
+    except (OSError, TypeError):
         return None

src/azure-cli-telemetry/azure/cli/telemetry/components/telemetry_note.py

@@ -41,7 +41,7 @@ def get_last_sent(self):
             last_send = datetime.datetime.strptime(raw, '%Y-%m-%dT%H:%M:%S')
             self._logger.info("Read timestamp from the note. The last send was %s.", last_send)
             return last_send
-        except (AttributeError, ValueError, IOError) as err:
+        except (OSError, AttributeError, ValueError) as err:
             self._logger.warning("Fail to parse or read the timestamp '%s' in the note file. Set the last send time "
                                  "to minimal. Reason: %s", raw, err)
             return fallback
@@ -54,7 +54,7 @@ def update_telemetry_note(self, next_send):
                 self.fh.write(next_send.strftime('%Y-%m-%dT%H:%M:%S'))
                 self.fh.truncate()
                 break
-            except IOError:
+            except OSError:
                 self._logger.warning('Fail to update the note file. This is the %d try.', retry + 1)
         else:
             # TODO: how to save this?

src/azure-cli/azure/cli/command_modules/acr/helm.py

@@ -227,7 +227,7 @@ def acr_helm_install_cli(client_version='2.16.3', install_location=None, yes=Fal
 
                 if os.path.splitext(f.name)[0] in ('helm', 'tiller'):
                     os.chmod(target_path, os.stat(target_path).st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
-    except IOError as e:
+    except OSError as e:
         import traceback
         logger.debug(traceback.format_exc())
         raise CLIError('Error while installing {} to {}: {}'.format(cli, install_dir, e))