--- a/eric6/Project/Project.py Sat Nov 21 19:31:16 2020 +0100
+++ b/eric6/Project/Project.py Sun Nov 22 16:04:59 2020 +0100
@@ -1468,7 +1468,7 @@
fn = os.path.join(self.ppath, langFile)
if os.path.exists(fn):
s2t(fn)
- except EnvironmentError as err:
+ except OSError as err:
E5MessageBox.critical(
self.ui,
self.tr("Delete translation"),
@@ -1490,7 +1490,7 @@
fn = os.path.join(self.ppath, qmFile)
if os.path.exists(fn):
s2t(fn)
- except EnvironmentError as err:
+ except OSError as err:
E5MessageBox.critical(
self.ui,
self.tr("Delete translation"),
@@ -1642,7 +1642,7 @@
return # don't overwrite
shutil.copy(fn, target)
- except IOError as why:
+ except OSError as why:
E5MessageBox.critical(
self.ui,
self.tr("Add file"),
@@ -1701,7 +1701,7 @@
):
try:
os.makedirs(target)
- except IOError as why:
+ except OSError as why:
E5MessageBox.critical(
self.ui,
self.tr("Add directory"),
@@ -1733,7 +1733,7 @@
# don't overwrite, carry on with next file
shutil.copy(file, target)
- except EnvironmentError:
+ except OSError:
continue
self.appendFile(targetfile)
@@ -2209,7 +2209,7 @@
"__pycache__", "{0}.*{1}".format(tail, ext))
for f in glob.glob(pat):
s2t(f)
- except EnvironmentError as err:
+ except OSError as err:
E5MessageBox.critical(
self.ui,
self.tr("Delete file"),
@@ -2239,7 +2239,7 @@
send2trash(dn)
except ImportError:
shutil.rmtree(dn, True)
- except EnvironmentError as err:
+ except OSError as err:
E5MessageBox.critical(
self.ui,
self.tr("Delete directory"),
@@ -2334,7 +2334,7 @@
if not os.path.isdir(self.ppath):
try:
os.makedirs(self.ppath)
- except EnvironmentError:
+ except OSError:
E5MessageBox.critical(
self.ui,
self.tr("Create project directory"),
@@ -2399,7 +2399,7 @@
try:
# create management directory if not present
self.createProjectManagementDir()
- except EnvironmentError:
+ except OSError:
E5MessageBox.critical(
self.ui,
self.tr("Create project management directory"),
@@ -2420,7 +2420,7 @@
os.makedirs(os.path.dirname(ms))
with open(ms, "w"):
pass
- except EnvironmentError as err:
+ except OSError as err:
E5MessageBox.critical(
self.ui,
self.tr("Create main script"),
@@ -2444,7 +2444,7 @@
os.makedirs(os.path.dirname(mf))
with open(mf, "w"):
pass
- except EnvironmentError as err:
+ except OSError as err:
E5MessageBox.critical(
self.ui,
self.tr("Create Makefile"),
@@ -2735,7 +2735,7 @@
try:
with open(mf, "w"):
pass
- except EnvironmentError as err:
+ except OSError as err:
E5MessageBox.critical(
self.ui,
self.tr("Create Makefile"),
@@ -2909,7 +2909,7 @@
try:
# create management directory if not present
self.createProjectManagementDir()
- except EnvironmentError:
+ except OSError:
E5MessageBox.critical(
self.ui,
self.tr("Create project management directory"),
@@ -5281,7 +5281,7 @@
for f in lst]))
pkglistFile.write("\n")
# ensure the file ends with an empty line
- except IOError as why:
+ except OSError as why:
E5MessageBox.critical(
self.ui,
self.tr("Create Package List"),
@@ -5348,7 +5348,7 @@
try:
with open(pkglist, "r", encoding="utf-8") as pkglistFile:
names = pkglistFile.read()
- except IOError as why:
+ except OSError as why:
E5MessageBox.critical(
self.ui,
self.tr("Create Plugin Archive"),
@@ -5404,7 +5404,7 @@
self.pdata["MAINSCRIPT"].replace(".py", ".zip"))
try:
archiveFile = zipfile.ZipFile(archive, "w")
- except IOError as why:
+ except OSError as why:
E5MessageBox.critical(
self.ui,
self.tr("Create Plugin Archive"),
@@ -5513,7 +5513,7 @@
try:
sourcelines, encoding = Utilities.readEncodedFile(filename)
sourcelines = sourcelines.splitlines(True)
- except (IOError, UnicodeError) as why:
+ except (OSError, UnicodeError) as why:
E5MessageBox.critical(
self.ui,
self.tr("Create Plugin Archive"),
@@ -5554,7 +5554,7 @@
try:
sourcelines = Utilities.readEncodedFile(filename)[0]
sourcelines = sourcelines.splitlines(True)
- except (IOError, UnicodeError) as why:
+ except (OSError, UnicodeError) as why:
E5MessageBox.critical(
self.ui,
self.tr("Create Plugin Archive"),
