eric6/Plugins/VcsPlugins/vcsGit/git.py

changeset 7836
2f0d208b8137
parent 7785
9978016560ec
child 7900
72b88fb20261
child 7924
8a96736d465e
--- a/eric6/Plugins/VcsPlugins/vcsGit/git.py	Sat Nov 21 19:31:16 2020 +0100
+++ b/eric6/Plugins/VcsPlugins/vcsGit/git.py	Sun Nov 22 16:04:59 2020 +0100
@@ -1404,7 +1404,7 @@
                     ignore.write("\n".join(ignorePatterns))
                     ignore.write("\n")
                 status = True
-            except IOError:
+            except OSError:
                 status = False
             
             if status and autoAdd:
@@ -1630,7 +1630,7 @@
                     output2 = f1.read()
                     f1.close()
                 name2 = "{0} (Work)".format(name)
-            except IOError:
+            except OSError:
                 E5MessageBox.critical(
                     self.__ui,
                     self.tr("Git Side-by-Side Difference"),
@@ -2664,7 +2664,7 @@
             try:
                 with open(fname, "w") as f:
                     f.write(output)
-            except (OSError, IOError) as err:
+            except OSError as err:
                 E5MessageBox.critical(
                     self.__ui,
                     self.tr("Create Bisect Replay File"),
@@ -3579,7 +3579,7 @@
             try:
                 with open(cfgFile, "w"):
                     pass
-            except IOError:
+            except OSError:
                 pass
         self.repoEditor = MiniEditor(cfgFile, "Properties")
         self.repoEditor.show()
@@ -3603,7 +3603,7 @@
                     f.write("[user]\n")
                     f.write("    name = {0} {1}\n".format(firstName, lastName))
                     f.write("    email = {0}\n".format(email))
-            except (IOError, OSError):
+            except OSError:
                 # ignore these
                 pass
         self.userEditor = MiniEditor(cfgFile, "Properties")

eric ide

mercurial