increase connect default timeout; handle CPython descriptor protocol class arg

Author: dhalbert

adafruit_ble/__init__.py

@@ -261,7 +261,7 @@ def stop_scan(self):
            once empty."""
         self._adapter.stop_scan()
 
-    def connect(self, advertisement, *, timeout=4):
+    def connect(self, advertisement, *, timeout=10.0):
         """
         Initiates a `BLEConnection` to the peer that advertised the given advertisement.
 

adafruit_ble/advertising/__init__.py

@@ -103,6 +103,8 @@ def __init__(self, bit_position):
         self._bitmask = 1 << bit_position
 
     def __get__(self, obj, cls):
+        if obj is None:
+            return self
         return (obj.flags & self._bitmask) != 0
 
     def __set__(self, obj, value):

adafruit_ble/advertising/standard.py

@@ -155,6 +155,8 @@ def _present(self, obj):
         return False
 
     def __get__(self, obj, cls):
+        if obj is None:
+            return self
         if not self._present(obj) and not obj.mutable:
             return ()
         if not hasattr(obj, "adv_service_lists"):
@@ -315,6 +317,8 @@ def __init__(self, service):
         self._prefix = bytes(service.uuid)
 
     def __get__(self, obj, cls):
+        if obj is None:
+            return self
         # If not present at all and mutable, then we init it, otherwise None.
         if self._adt not in obj.data_dict:
             if obj.mutable:

adafruit_ble/characteristics/__init__.py

@@ -151,6 +151,10 @@ def __bind_locally(self, service, initial_value):
         )
 
     def __get__(self, service, cls=None):
+        # CircuitPython doesn't invoke descriptor protocol on obj's class,
+        # but CPython does. In the CPython case, pretend that it doesn't.
+        if service is None:
+            return self
         self._ensure_bound(service)
         bleio_characteristic = service.bleio_characteristics[self.field_name]
         return bleio_characteristic.value
@@ -210,6 +214,8 @@ def bind(self, service):
         )
 
     def __get__(self, service, cls=None):
+        if service is None:
+            return self
         bound_object = self.bind(service)
         setattr(service, self.field_name, bound_object)
         return bound_object
@@ -253,6 +259,8 @@ def __init__(
         )
 
     def __get__(self, obj, cls=None):
+        if obj is None:
+            return self
         raw_data = super().__get__(obj, cls)
         if len(raw_data) < self._expected_size:
             return None

adafruit_ble/characteristics/float.py

@@ -58,6 +58,8 @@ def __init__(
         )
 
     def __get__(self, obj, cls=None):
+        if obj is None:
+            return self
         return super().__get__(obj)[0]
 
     def __set__(self, obj, value):

adafruit_ble/characteristics/int.py

@@ -66,6 +66,8 @@ def __init__(
         )
 
     def __get__(self, obj, cls=None):
+        if obj is None:
+            return self
         return super().__get__(obj)[0]
 
     def __set__(self, obj, value):

adafruit_ble/characteristics/string.py

@@ -57,6 +57,8 @@ def __init__(
         )
 
     def __get__(self, obj, cls=None):
+        if obj is None:
+            return self
         return str(super().__get__(obj, cls), "utf-8")
 
     def __set__(self, obj, value):
@@ -76,4 +78,6 @@ def __init__(self, *, uuid=None, read_perm=Attribute.OPEN):
         )
 
     def __get__(self, obj, cls=None):
+        if obj is None:
+            return self
         return str(super().__get__(obj, cls), "utf-8")