From ace013d8c36db60706ed136c8684bef37a2b9504 Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Mon, 17 Jul 2023 11:10:45 +0300 Subject: [PATCH] ucloud: Fix asyncio imports to support recent upstream changes. - Modules starting with u- prefix have been renamed upstream, this method to detect micropython by trying to import CPython modules first doesn't work anymore. --- src/arduino_iot_cloud/ucloud.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/arduino_iot_cloud/ucloud.py b/src/arduino_iot_cloud/ucloud.py index a96d919..65b17e9 100644 --- a/src/arduino_iot_cloud/ucloud.py +++ b/src/arduino_iot_cloud/ucloud.py @@ -10,14 +10,11 @@ from senml import SenmlRecord from arduino_iot_cloud.umqtt import MQTTClient +import asyncio +from asyncio import CancelledError try: - import asyncio - from asyncio import CancelledError from asyncio import InvalidStateError -except ImportError: - import uasyncio as asyncio - from uasyncio.core import CancelledError - +except (ImportError, AttributeError): # MicroPython doesn't have this exception class InvalidStateError(Exception): pass