From 6ac5be036bb8f630c30349c740e2e3b827c223b3 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 17 Feb 2023 13:30:17 +0100
Subject: [PATCH] ucloud: Update module imports.
---
README.md | 1 -
arduino_iot_cloud/ucloud.py | 3 +--
arduino_iot_cloud/umqtt.py | 13 +++++--------
examples/micropython.py | 4 ++--
4 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 1736371..1166221 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,6 @@ openssl x509 -in cert.pem -out cert.der -outform DER
## Useful links
-* [ulogging](https://github.com/iabdalkader/micropython-ulogging)
* [senml-micropython](https://github.com/kpn-iot/senml-micropython-library)
* [m2crypto](https://github.com/m2crypto/m2crypto)
* [umqtt.simple](https://github.com/micropython/micropython-lib/tree/master/micropython/umqtt.simple)
diff --git a/arduino_iot_cloud/ucloud.py b/arduino_iot_cloud/ucloud.py
index a7ea567..d0cde91 100644
--- a/arduino_iot_cloud/ucloud.py
+++ b/arduino_iot_cloud/ucloud.py
@@ -5,17 +5,16 @@
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
import time
+import logging
from kpn_senml import SenmlPack
from kpn_senml import SenmlRecord
from arduino_iot_cloud.umqtt import MQTTClient
try:
- import logging
import asyncio
from asyncio import CancelledError
from asyncio import InvalidStateError
except ImportError:
- import ulogging as logging
import uasyncio as asyncio
from uasyncio.core import CancelledError
diff --git a/arduino_iot_cloud/umqtt.py b/arduino_iot_cloud/umqtt.py
index 2d42df1..1c727e6 100644
--- a/arduino_iot_cloud/umqtt.py
+++ b/arduino_iot_cloud/umqtt.py
@@ -22,17 +22,14 @@
#
# Based on: https://github.com/micropython/micropython-lib/tree/master/micropython/umqtt.simple
+import socket
+import struct
+import select
+import logging
+
try:
from ussl import wrap_socket
- import usocket as socket
- import ustruct as struct
- import ulogging as logging
- import uselect as select
except ImportError:
- import socket
- import struct
- import logging
- import select
from arduino_iot_cloud.ussl import wrap_socket
diff --git a/examples/micropython.py b/examples/micropython.py
index ceee53e..260cca2 100644
--- a/examples/micropython.py
+++ b/examples/micropython.py
@@ -4,8 +4,8 @@
import time
import ussl
import network
-import ulogging as logging
-from ulogging.ustrftime import strftime
+import logging
+from time import strftime
from arduino_iot_cloud import AIOTClient
from arduino_iot_cloud import Location
from arduino_iot_cloud import Schedule