Merge pull request #779 from akx/more-ruff

Enable more Ruff rules (incl. those `ignore`d previously)

Author: PierreF

examples/client_mqtt_clear_retain.py

@@ -28,7 +28,7 @@
 
 
 def on_connect(mqttc, userdata, flags, rc):
-    if userdata == True:
+    if userdata:
         print("rc: " + str(rc))
 
 
@@ -38,7 +38,7 @@ def on_message(mqttc, userdata, msg):
         pass
         # sys.exit()
     else:
-        if userdata == True:
+        if userdata:
             print("Clearing topic " + msg.topic)
         (rc, final_mid) = mqttc.publish(msg.topic, None, 1, True)
 
@@ -96,7 +96,7 @@ def main(argv):
         elif opt in ("-v", "--verbose"):
             verbose = True
 
-    if topic == None:
+    if not topic:
         print("You must provide a topic to clear.\n")
         print_usage()
         sys.exit(2)

examples/client_pub_opts.py

@@ -32,8 +32,8 @@
 parser.add_argument('-d', '--disable-clean-session', action='store_true', help="disable 'clean session' (sub + msgs not cleared when client disconnects)")
 parser.add_argument('-p', '--password', required=False, default=None)
 parser.add_argument('-P', '--port', required=False, type=int, default=None, help='Defaults to 8883 for TLS or 1883 for non-TLS')
-parser.add_argument('-N', '--nummsgs', required=False, type=int, default=1, help='send this many messages before disconnecting') 
-parser.add_argument('-S', '--delay', required=False, type=float, default=1, help='number of seconds to sleep between msgs') 
+parser.add_argument('-N', '--nummsgs', required=False, type=int, default=1, help='send this many messages before disconnecting')
+parser.add_argument('-S', '--delay', required=False, type=float, default=1, help='number of seconds to sleep between msgs')
 parser.add_argument('-k', '--keepalive', required=False, type=int, default=60)
 parser.add_argument('-s', '--use-tls', action='store_true')
 parser.add_argument('--insecure', action='store_true')
@@ -68,7 +68,7 @@ def on_log(mqttc, obj, level, string):
 if args.cacerts:
     usetls = True
 
-port = args.port    
+port = args.port
 if port is None:
     if usetls:
         port = 8883
@@ -94,7 +94,7 @@ def on_log(mqttc, obj, level, string):
         cert_required = ssl.CERT_REQUIRED
     else:
         cert_required = ssl.CERT_NONE
-        
+
     mqttc.tls_set(ca_certs=args.cacerts, certfile=None, keyfile=None, cert_reqs=cert_required, tls_version=tlsVersion)
 
     if args.insecure:
@@ -125,4 +125,4 @@ def on_log(mqttc, obj, level, string):
     time.sleep(args.delay)
 
 mqttc.disconnect()
-    
+

examples/client_rpc_math.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2020 Frank Pagliughi <fpagliughi@mindspring.com>
-# All rights reserved. 
-# 
-# This program and the accompanying materials are made available 
+# All rights reserved.
+#
+# This program and the accompanying materials are made available
 # under the terms of the Eclipse Distribution License v1.0
 # which accompanies this distribution.
 #
@@ -96,7 +96,7 @@ def on_message(mqttc, userdata, msg):
     args.append(float(s))
 
 # Send the request
-topic = "requests/math/" + func 
+topic = "requests/math/" + func
 payload = json.dumps(args)
 mqttc.publish(topic, payload, qos=1, properties=props)
 

examples/client_sub_opts.py

@@ -65,7 +65,7 @@ def on_log(mqttc, obj, level, string):
 if args.cacerts:
     usetls = True
 
-port = args.port    
+port = args.port
 if port is None:
     if usetls:
         port = 8883
@@ -91,7 +91,7 @@ def on_log(mqttc, obj, level, string):
         cert_required = ssl.CERT_REQUIRED
     else:
         cert_required = ssl.CERT_NONE
-        
+
     mqttc.tls_set(ca_certs=args.cacerts, certfile=None, keyfile=None, cert_reqs=cert_required, tls_version=tlsVersion)
 
     if args.insecure:

examples/server_rpc_math.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 # Copyright (c) 2020 Frank Pagliughi <fpagliughi@mindspring.com>
-# All rights reserved. 
-# 
-# This program and the accompanying materials are made available 
+# All rights reserved.
+#
+# This program and the accompanying materials are made available
 # under the terms of the Eclipse Distribution License v1.0
 # which accompanies this distribution.
 #
@@ -45,7 +45,7 @@ def on_connect(mqttc, userdata, flags, rc, props):
         print("Subscribing to math requests")
         mqttc.subscribe("requests/math/#")
 
-# Each incoming message should be an RPC request on the 
+# Each incoming message should be an RPC request on the
 # 'requests/math/#' topic.
 def on_message(mqttc, userdata, msg):
     print(msg.topic + "  " + str(msg.payload))
@@ -83,7 +83,7 @@ def on_log(mqttc, obj, level, string):
 
 
 # Typically with an RPC service, you want to make sure that you're the only
-# client answering requests for specific topics. Using a known client ID 
+# client answering requests for specific topics. Using a known client ID
 # might help.
 mqttc = mqtt.Client(client_id="paho_rpc_math_srvr", protocol=mqtt.MQTTv5)
 mqttc.on_message = on_message

pyproject.toml

@@ -74,30 +74,29 @@ testpaths = "tests src"
 [tool.ruff]
 exclude = ["test/lib/python/*"]
 extend-select = [
-    "S",  # Bandit
+    "B",
     "E9",
     "F63",
     "F7",
     "F82",
     "I",
+    "S", # Bandit
+    "UP",
+    "W",
 ]
-ignore = [
-    "E402", # TODO: enable
-    "E711", # TODO: enable
-    "E712", # TODO: enable
-    "E721", # TODO: enable
-    "S101", # TODO: enable
-    "S110", # TODO: enable
-    "S324", # TODO: enable
-]
+ignore = []
 line-length = 167
 
 [tool.ruff.per-file-ignores]
 "{test,tests,examples}/**/*.py" = [
+    "B",
+    "E402",
+    "E711",
     "E741",
     "F401",
     "F811",
     "F841",
     "I",
     "S",
-]
+    "UP",
+]