Mercurial Repositories > eric / file diff

--- a/eric6/Project/Project.py	Sun Apr 11 12:38:16 2021 +0200
+++ b/eric6/Project/Project.py	Sun Apr 11 16:53:48 2021 +0200
@@ -3762,11 +3762,13 @@
         """
         newfn = os.path.abspath(fn)
         newfn = self.getRelativePath(newfn)
-        for group in ["SOURCES", "FORMS", "INTERFACES", "PROTOCOLS",
-                      "RESOURCES", "TRANSLATIONS", "OTHERS"]:
-            if newfn in self.pdata[group]:
-                return True
-        return False
+        return any(
+            newfn in self.pdata[group]
+            for group in [
+                "SOURCES", "FORMS", "INTERFACES", "PROTOCOLS", "RESOURCES",
+                "TRANSLATIONS", "OTHERS"
+            ]
+        )
     
     def isProjectFile(self, fn):
         """
@@ -3776,12 +3778,13 @@
         @param fn filename to be checked (string)
         @return flag indicating membership (boolean)
         """
-        for group in ["SOURCES", "FORMS", "INTERFACES", "PROTOCOLS",
-                      "RESOURCES", "TRANSLATIONS", "OTHERS"]:
-            if self.__checkProjectFileGroup(fn, group):
-                return True
-        
-        return False
+        return any(
+            self.__checkProjectFileGroup(fn, group)
+            for group in [
+                "SOURCES", "FORMS", "INTERFACES", "PROTOCOLS", "RESOURCES",
+                "TRANSLATIONS", "OTHERS"
+            ]
+        )
         
     def __checkProjectFileGroup(self, fn, group):
         """
@@ -3797,20 +3800,18 @@
         if newfn in self.pdata[group]:
             return True
         elif group == "OTHERS":
-            for entry in self.pdata[group]:
-                if newfn.startswith(entry):
-                    return True
+            if any(newfn.startswith(entry) for entry in self.pdata[group]):
+                return True
         
         if Utilities.isWindowsPlatform():
             # try the above case-insensitive
             newfn = newfn.lower()
-            for entry in self.pdata[group]:
-                if entry.lower() == newfn:
-                    return True
+            if any(entry.lower() == newfn for entry in self.pdata[group]):
+                return True
         elif group == "OTHERS":
-            for entry in self.pdata[group]:
-                if newfn.startswith(entry.lower()):
-                    return True
+            if any(newfn.startswith(entry.lower())
+                   for entry in self.pdata[group]):
+                return True
         
         return False