PySwitchbot 0.57.0__tar.gz → 0.57.1__tar.gz

{pyswitchbot-0.57.0 → pyswitchbot-0.57.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PySwitchbot
-Version: 0.57.0
+Version: 0.57.1
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.57.0 → pyswitchbot-0.57.1}/PySwitchbot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PySwitchbot
-Version: 0.57.0
+Version: 0.57.1
 Summary: A library to communicate with Switchbot
 Home-page: https://github.com/sblibs/pySwitchbot/
 Author: Daniel Hjelseth Hoyer

{pyswitchbot-0.57.0 → pyswitchbot-0.57.1}/setup.py

@@ -20,7 +20,7 @@ setup(
         "cryptography>=39.0.0",
         "pyOpenSSL>=23.0.0",
     ],
-    version="0.57.0",
+    version="0.57.1",
     description="A library to communicate with Switchbot",
     long_description=long_description,
     long_description_content_type="text/markdown",

{pyswitchbot-0.57.0 → pyswitchbot-0.57.1}/switchbot/adv_parser.py

@@ -41,8 +41,6 @@ SERVICE_DATA_ORDER = (
 )
 MFR_DATA_ORDER = (2409, 741, 89)
 
-APPLE_MANUFACTURER_ID = 76
-
 
 class SwitchbotSupportedType(TypedDict):
     """Supported type of Switchbot."""
@@ -250,14 +248,10 @@ def parse_advertisement_data(
 
     _mfr_data = None
     _mfr_id = None
-    manufacturer_data = advertisement_data.manufacturer_data
-    if APPLE_MANUFACTURER_ID in manufacturer_data:
-        return None
-
     for mfr_id in MFR_DATA_ORDER:
-        if mfr_id in manufacturer_data:
+        if mfr_id in advertisement_data.manufacturer_data:
             _mfr_id = mfr_id
-            _mfr_data = manufacturer_data[mfr_id]
+            _mfr_data = advertisement_data.manufacturer_data[mfr_id]
             break
 
     if _mfr_data is None and _service_data is None:

{pyswitchbot-0.57.0 → pyswitchbot-0.57.1}/tests/test_adv_parser.py

@@ -1970,28 +1970,3 @@ def test_remote_passive() -> None:
         rssi=-97,
         active=False,
     )
-
-
-def test_parse_advertisement_ignores_devices_with_apple_manufacturer_id():
-    """Test parse_advertisement_data ignores devices with apple manufacturer id."""
-    ble_device = generate_ble_device("aa:bb:cc:dd:ee:ff", "any")
-    adv_data = generate_advertisement_data(
-        local_name="WoCurtain",
-        manufacturer_data={
-            89: b"\xcc\xf4\xc4\xf9\xacl",
-            2409: b"\xcc\xf4\xc4\xf9\xacl\xe2\x0f\x00\x12\x04",
-            76: b"\x10",
-        },
-        service_data={
-            "00000d00-0000-1000-8000-00805f9b34fb": b"c\xd0Yd\x11\x04",
-            "0000fd3d-0000-1000-8000-00805f9b34fb": b"c\xc0d\x00\x12\x04",
-        },
-        service_uuids=[
-            "00001800-0000-1000-8000-00805f9b34fb",
-            "00001801-0000-1000-8000-00805f9b34fb",
-            "cba20d00-224d-11e6-9fb8-0002a5d5c51b",
-        ],
-        rssi=-2,
-    )
-    result = parse_advertisement_data(ble_device, adv_data)
-    assert result is None