Add formating

.pre-commit-config.yaml

@@ -32,6 +32,7 @@ repos:
     rev: v0.1.9
     hooks:
       - id: ruff  # See pyproject.toml for args
+      - id: ruff-format
 
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.15

pyproject.toml

@@ -75,6 +75,7 @@ testpaths = "tests src"
 exclude = ["test/lib/python/*"]
 extend-select = [
     "B",
+    "COM",
     "E9",
     "F63",
     "F7",
@@ -85,12 +86,17 @@ extend-select = [
     "UP",
     "W",
 ]
-ignore = []
+# COM812: as recommended by ruff-format
+ignore = ["COM812"]
 line-length = 167
 
+[tool.ruff.format]
+exclude = ["examples/**/*.py"]
+
 [tool.ruff.per-file-ignores]
 "examples/**/*.py" = [
     "B",
+    "COM",
     "E402",
     "E711",
     "E741",

src/paho/mqtt/matcher.py

@@ -7,7 +7,7 @@ class MQTTMatcher:
     some topic name."""
 
     class Node:
-        __slots__ = '_children', '_content'
+        __slots__ = "_children", "_content"
 
         def __init__(self):
             self._children = {}
@@ -20,15 +20,15 @@ def __setitem__(self, key, value):
         """Add a topic filter :key to the prefix tree
         and associate it to :value"""
         node = self._root
-        for sym in key.split('/'):
+        for sym in key.split("/"):
             node = node._children.setdefault(sym, self.Node())
         node._content = value
 
     def __getitem__(self, key):
         """Retrieve the value associated with some topic filter :key"""
         try:
             node = self._root
-            for sym in key.split('/'):
+            for sym in key.split("/"):
                 node = node._children[sym]
             if node._content is None:
                 raise KeyError(key)
@@ -41,24 +41,25 @@ def __delitem__(self, key):
         lst = []
         try:
             parent, node = None, self._root
-            for k in key.split('/'):
-                 parent, node = node, node._children[k]
-                 lst.append((parent, k, node))
+            for k in key.split("/"):
+                parent, node = node, node._children[k]
+                lst.append((parent, k, node))
             # TODO
             node._content = None
         except KeyError as ke:
             raise KeyError(key) from ke
         else:  # cleanup
             for parent, k, node in reversed(lst):
                 if node._children or node._content is not None:
-                     break
+                    break
                 del parent._children[k]
 
     def iter_match(self, topic):
         """Return an iterator on all values associated with filters
         that match the :topic"""
-        lst = topic.split('/')
-        normal = not topic.startswith('$')
+        lst = topic.split("/")
+        normal = not topic.startswith("$")
+
         def rec(node, i=0):
             if i == len(lst):
                 if node._content is not None:
@@ -68,11 +69,12 @@ def rec(node, i=0):
                 if part in node._children:
                     for content in rec(node._children[part], i + 1):
                         yield content
-                if '+' in node._children and (normal or i > 0):
-                    for content in rec(node._children['+'], i + 1):
+                if "+" in node._children and (normal or i > 0):
+                    for content in rec(node._children["+"], i + 1):
                         yield content
-            if '#' in node._children and (normal or i > 0):
-                content = node._children['#']._content
+            if "#" in node._children and (normal or i > 0):
+                content = node._children["#"]._content
                 if content is not None:
                     yield content
+
         return rec(self._root)

src/paho/mqtt/packettypes.py

@@ -30,14 +30,26 @@ class PacketTypes:
     indexes = range(1, 16)
 
     # Packet types
-    CONNECT, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL, \
-        PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK, \
-        PINGREQ, PINGRESP, DISCONNECT, AUTH = indexes
+    CONNECT, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL, PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK, PINGREQ, PINGRESP, DISCONNECT, AUTH = indexes
 
     # Dummy packet type for properties use - will delay only applies to will
     WILLMESSAGE = 99
 
-    Names = [ "reserved", \
-    "Connect", "Connack", "Publish", "Puback", "Pubrec", "Pubrel", \
-    "Pubcomp", "Subscribe", "Suback", "Unsubscribe", "Unsuback", \
-    "Pingreq", "Pingresp", "Disconnect", "Auth"]
+    Names = [
+        "reserved",
+        "Connect",
+        "Connack",
+        "Publish",
+        "Puback",
+        "Pubrec",
+        "Pubrel",
+        "Pubcomp",
+        "Subscribe",
+        "Suback",
+        "Unsubscribe",
+        "Unsuback",
+        "Pingreq",
+        "Pingresp",
+        "Disconnect",
+        "Auth",
+    ]