clean up matches()

Author: dhalbert

adafruit_ble/advertising/__init__.py

@@ -304,7 +304,15 @@ def get_prefix_bytes(cls):
         return cls._prefix_bytes
 
     @classmethod
-    def matches(cls, entry, all_=True):
+    def matches(cls, entry):
+        """Returns ``True`` if the given `_bleio.ScanEntry` advertisement fields
+        matches all of the given prefixes in the `match_prefixes` tuple attribute.
+        Subclasses may override this to match any instead of all.
+        """
+        return cls.matches_prefixes(entry, all_=True)
+
+    @classmethod
+    def matches_prefixes(cls, entry, *, all_):
         """Returns ``True`` if the given `_bleio.ScanEntry` advertisement fields
         match any or all of the given prefixes in the `match_prefixes` tuple attribute.
         If `all_` is ``True``, all the prefixes must match. If ``all_`` is ``False``,

adafruit_ble/advertising/standard.py

@@ -184,8 +184,11 @@ def __init__(self, *services):
         self.flags.le_only = True
 
     @classmethod
-    def matches(cls, entry, all_=False):
-        return super().matches(entry, all_=all_)
+    def matches(cls, entry):
+        """Only one kind of service list need be present in a ProvideServicesAdvertisement,
+        so override the default behavior and match any prefix, not all.
+        """
+        return cls.matches_prefixes(entry, all_=False)
 
 
 class SolicitServicesAdvertisement(Advertisement):