diff -r 1444b4bee64b -r 093dcebe5ecb src/eric7/Project/Project.py
--- a/src/eric7/Project/Project.py Sun Dec 03 16:44:52 2023 +0100
+++ b/src/eric7/Project/Project.py Sun Dec 03 19:46:34 2023 +0100
@@ -710,7 +710,7 @@
@return list of known file categories
@rtype list of str
"""
- return list(self.__fileCategoriesRepository.keys())
+ return list(self.__fileCategoriesRepository)
def getFileCategoryFilters(self, categories=None, withOthers=False, withAll=True):
"""
@@ -910,7 +910,7 @@
# File categories handled by activated plugin project browsers
for fileCategory in [
f
- for f in self.__fileCategoriesRepository.keys()
+ for f in self.__fileCategoriesRepository
if f not in ["SOURCES", "FORMS", "RESOURCES", "TRANSLATIONS", "OTHERS"]
]:
for ext in self.__fileCategoriesRepository[
@@ -948,7 +948,7 @@
with contextlib.suppress(KeyError):
if self.__fileTypeCallbacks[self.__pdata["PROJECTTYPE"]] is not None:
ftypes = self.__fileTypeCallbacks[self.__pdata["PROJECTTYPE"]]()
- for pattern, ftype in list(ftypes.items()):
+ for pattern, ftype in ftypes.items():
if pattern not in self.__pdata["FILETYPES"]:
self.__pdata["FILETYPES"][pattern] = ftype
self.setDirty(True)
@@ -1872,7 +1872,7 @@
if fnmatch.fnmatch(bfn, "*.ts") or fnmatch.fnmatch(bfn, "*.qm"):
filetype = "TRANSLATIONS"
else:
- for pattern in sorted(self.__pdata["FILETYPES"].keys(), reverse=True):
+ for pattern in sorted(self.__pdata["FILETYPES"], reverse=True):
if fnmatch.fnmatch(bfn, pattern):
filetype = self.__pdata["FILETYPES"][pattern]
break
@@ -1988,7 +1988,7 @@
# get all relevant filename patterns
patterns = []
ignorePatterns = []
- for pattern, patterntype in list(self.__pdata["FILETYPES"].items()):
+ for pattern, patterntype in self.__pdata["FILETYPES"].items():
if patterntype == filetype:
patterns.append(pattern)
elif patterntype == "__IGNORE__":
@@ -2283,7 +2283,7 @@
for fn in self.__pdata[fileCategory][:]:
filetype = fileCategory
bfn = os.path.basename(fn)
- for pattern in sorted(self.__pdata["FILETYPES"].keys(), reverse=True):
+ for pattern in sorted(self.__pdata["FILETYPES"], reverse=True):
if fnmatch.fnmatch(bfn, pattern):
filetype = self.__pdata["FILETYPES"][pattern]
break
@@ -2776,8 +2776,7 @@
.getPluginDisplayStrings("version_control")
)
vcsSystemsDisplay = [self.tr("None")]
- keys = sorted(vcsSystemsDict.keys())
- for key in keys:
+ for key in sorted(vcsSystemsDict):
vcsSystemsDisplay.append(vcsSystemsDict[key])
vcsSelected, ok = QInputDialog.getItem(
None,
@@ -2870,8 +2869,7 @@
ignoreList = [os.path.split(environmentPath)[-1]]
with EricOverrideCursor():
# search the project directory for files with known extensions
- filespecs = list(self.__pdata["FILETYPES"].keys())
- for filespec in filespecs:
+ for filespec in self.__pdata["FILETYPES"]:
files = FileSystemUtilities.direntries(
self.ppath,
filesonly=True,
@@ -3122,7 +3120,7 @@
@return the requested lexer language (string)
"""
# try user settings first
- for pattern, language in list(self.__pdata["LEXERASSOCS"].items()):
+ for pattern, language in self.__pdata["LEXERASSOCS"].items():
if fnmatch.fnmatch(filename, pattern):
return language
@@ -5612,7 +5610,7 @@
filetype = ""
bfn = os.path.basename(fn)
- for pattern in sorted(self.__pdata["FILETYPES"].keys(), reverse=True):
+ for pattern in sorted(self.__pdata["FILETYPES"], reverse=True):
if fnmatch.fnmatch(bfn, pattern):
filetype = self.__pdata["FILETYPES"][pattern]
break
