Fix E711 None comparison ruff lint

Author: jacomago

channelfinder/cfMonitorTest.py

@@ -50,7 +50,7 @@ def main():
         help="the --final-file",
     )
     opts, args = parser.parse_args()
-    if args == None or len(args) == 0:
+    if not args:
         parser.error("Please specify a directory")
     if not opts.initialFile:
         parser.error("Please specify a initial test files")

channelfinder/cfPropertyManager/CFPropertyManager.py

@@ -62,7 +62,7 @@ def readConfiguration(path):
             print("IGNORE " + properties[1])
             exclusion_expression = re.compile(properties[1])
         else:
-            if client.findProperty(properties[0]) != None:
+            if client.findProperty(properties[0]) is not None:
                 try:
                     expression = re.compile(properties[1])
                     expression_list.append([expression, properties[0]])
@@ -88,13 +88,13 @@ def applyExpression():
         exclusion_expression = "[^_]+"
     for channel_name in dbllines:
         prop_list = []
-        if exclusion_expression.search(channel_name) != None:
+        if exclusion_expression.search(channel_name) is not None:
             if verbose:
                 print("EXCLUDE: " + channel_name)
         else:
             for expression in expression_list:
                 result = expression[0].search(channel_name)
-                if result != None:
+                if result is not None:
                     value = clean(result.group())
                     if verbose:
                         print("FOUND: " + value + " in " + channel_name)
@@ -156,7 +156,7 @@ def __getDefaultConfig(arg, value):
     """
     Clean reception of command line configurations for default assignment.
     """
-    if value == None:
+    if value is None:
         try:
             return basecfg.get("DEFAULT", arg)
         except:
@@ -211,7 +211,7 @@ def main():
         help="prompt user for password",
     )
     opts, args = parser.parse_args()
-    if len(args) == 0 or args == None:
+    if not args:
         parser.error("Please specify a file")
     mainRun(opts, args)
 
@@ -227,11 +227,11 @@ def mainRun(opts, args):
     password = __getDefaultConfig("password", opts.password)
     SERVICE_URL = __getDefaultConfig("serviceURL", opts.serviceURL)
     verbose = __getDefaultConfig("verbose", opts.verbose)
-    if username == None:
+    if username is None:
         username = "cf-update"  # CURRENT DEFAULT
-    if password == None:
+    if password is None:
         password = "1234"  # CURRENT DEFAULT
-    if SERVICE_URL == None:
+    if SERVICE_URL is None:
         SERVICE_URL = "https://localhost:8181/ChannelFinder"  # CURRENT DEFAULT
     startClient()
     run(args[0], args[1])

channelfinder/cfUpdate/CFUpdateIOC.py

@@ -76,7 +76,7 @@ def updateChannelFinder(
     username = channelfinder username
     password = channelfinder password
     """
-    if hostName == None or iocName == None:
+    if hostName is None or iocName is None:
         raise RuntimeError("missing hostName or iocName")
     channels = []
     try:
@@ -89,9 +89,9 @@ def updateChannelFinder(
     previousChannelsList = client.findByArgs(
         [("hostName", hostName), ("iocName", iocName)]
     )
-    if previousChannelsList != None:
+    if previousChannelsList is not None:
         for ch in previousChannelsList:
-            if pvNames != None and ch["name"] in pvNames:
+            if pvNames is not None and ch["name"] in pvNames:
                 """"""
                 channels.append(
                     updateChannel(
@@ -104,7 +104,7 @@ def updateChannelFinder(
                     )
                 )
                 pvNames.remove(ch["name"])
-            elif pvNames == None or ch["name"] not in pvNames:
+            elif pvNames is None or ch["name"] not in pvNames:
                 """Orphan the channel : mark as inactive, keep the old hostName and iocName"""
                 oldHostName = [
                     prop["value"]
@@ -141,7 +141,7 @@ def updateChannelFinder(
                     time=time,
                 )
             )
-        elif ch[0] != None:
+        elif ch[0] is not None:
             """update existing channel: exists but with a different hostName and/or iocName"""
             channels.append(
                 updateChannel(
@@ -174,9 +174,9 @@ def updateChannel(
         ]
     else:
         properties = []
-    if hostName != None:
+    if hostName is not None:
         properties.append({"name": "hostName", "owner": owner, "value": hostName})
-    if iocName != None:
+    if iocName is not None:
         properties.append({"name": "iocName", "owner": owner, "value": iocName})
     if pvStatus:
         properties.append({"name": "pvStatus", "owner": owner, "value": pvStatus})
@@ -193,11 +193,11 @@ def createChannel(
     Helper to create a channel object with the required properties
     """
     ch = {"name": chName, "owner": chOwner, "properties": []}
-    if hostName != None:
+    if hostName is not None:
         ch["properties"].append(
             {"name": "hostName", "owner": chOwner, "value": hostName}
         )
-    if iocName != None:
+    if iocName is not None:
         ch["properties"].append({"name": "iocName", "owner": chOwner, "value": iocName})
     if pvStatus:
         ch["properties"].append(
@@ -214,7 +214,7 @@ def checkPropertiesExist(client, propOwner):
     """
     requiredProperties = ["hostName", "iocName", "pvStatus", "time"]
     for propName in requiredProperties:
-        if client.findProperty(propName) == None:
+        if client.findProperty(propName) is None:
             try:
                 client.set(property={"name": propName, "owner": propOwner})
             except Exception as e:
@@ -226,7 +226,7 @@ def ifNoneReturnDefault(object, default):
     """
     if the object is None or empty string then this function returns the default value
     """
-    if object == None and object != "":
+    if object is None or object == "":
         return default
     else:
         return object
@@ -348,7 +348,7 @@ def main():
         help="prompt user for password",
     )
     opts, args = parser.parse_args()
-    if len(args) == 0 or args == None:
+    if not args:
         parser.error("Please specify a file")
     mainRun(opts, args)
 

test/testCFPpropertyManager.py

@@ -80,7 +80,7 @@ def test_regex(self):
             print(properties[0] + " = " + properties[1])
             try:
                 expression = re.compile(properties[1])
-                self.assertTrue(expression != None)
+                self.assertTrue(expression is not None)
 
             except Exception as e:
                 print("Invalid regular expression: ", properties[1])

test/testCFUpdateIOC.py

@@ -63,15 +63,15 @@ def testGetArgsFromFilename(self):
         # parse file which does not fit the format
         hostname, iocname = getArgsFromFilename("complete/path/to/file/somefilename")
         self.assertTrue(
-            hostname == None and iocname == None,
+            hostname is None and iocname is None,
             "failed to parse the file path correctly",
         )
         # file with only hostName
         hostname, iocname = getArgsFromFilename(
             "complete/path/to/file/aaa.somefilename"
         )
         self.assertTrue(
-            hostname == "aaa" and iocname == None, "failed to parse the file correctly"
+            hostname == "aaa" and iocname is None, "failed to parse the file correctly"
         )
         # parse the hostname/iocname from 1st and 2nd positions seperated by .
         hostname, iocname = getArgsFromFilename("complete/path/to/file/aaa.bbb.ccc.ddd")
@@ -96,7 +96,7 @@ def testAddUpdateChannels(self):
             property=[("hostName", hostName1), ("iocName", iocName1)]
         )
         self.assertTrue(
-            channels == None or len(channels) == 0, "channels already present"
+            not channels, "channels already present"
         )
         # New Channels added
         updateChannelFinder(
@@ -427,7 +427,7 @@ def __check4properties(self, prop, properties):
     def testNoneCheck(self):
         self.assertTrue(ifNoneReturnDefault("Value", "default") == "Value")
         self.assertTrue(ifNoneReturnDefault(None, "default") == "default")
-        self.assertTrue(ifNoneReturnDefault(None, None) == None)
+        self.assertTrue(ifNoneReturnDefault(None, None) is None)
         self.assertTrue(ifNoneReturnDefault("", "default") == "")
 
     def testPVUpdate(self):

test/testChannelFinderClient.py

@@ -840,9 +840,9 @@ def testSetRemoveSpecialChar(self):
                 "failed to delete channel with special char",
             )
             self.client.delete(tagName=spTag["name"])
-            self.assertTrue(self.client.findTag(spTag["name"]) == None)
+            self.assertTrue(self.client.findTag(spTag["name"]) is None)
             self.client.delete(propertyName=spProperty["name"])
-            self.assertTrue(self.client.findProperty(spProperty["name"]) == None)
+            self.assertTrue(self.client.findProperty(spProperty["name"]) is None)
 
     def testQuotes(self):
         spChannel = {"name": "'\"Name", "owner": self.channelOwner}
@@ -1700,7 +1700,7 @@ def testUpdateChannelWithNullPropertyValue(self):
                 },
             )
             print("client: " + str(self.client.find(name="channelName")[0]))
-            # should this/ be if client.find... == None ???
+            # should this/ be if client.find... is None ???
             self.assertFalse(
                 "existingProperty"
                 in self.client.find(name="channelName")[0]["properties"],
@@ -1802,7 +1802,7 @@ def checkTagOnChannel(client, channelName, tag):
     utility method which return true is channelName contains tag
     """
     ch = client.find(name=channelName)[0]
-    if ch["tags"] != None and checkTagInList(ch["tags"], [tag]):
+    if ch["tags"] is not None and checkTagInList(ch["tags"], [tag]):
         return True
     else:
         return False
@@ -1813,7 +1813,7 @@ def checkPropertyOnChannel(client, channelName, property):
     utility method which return true is channelName contains property
     """
     ch = client.find(name=channelName)[0]
-    if ch["properties"] != None and checkPropInList(ch["properties"], [property]):
+    if ch["properties"] is not None and checkPropInList(ch["properties"], [property]):
         return True
     else:
         return False