Skip to content

Commit 5bd024d

Browse files
authored
Merge pull request #46 from arduino/fix_imports
ucloud: Update module imports.
2 parents 982bb1a + 6ac5be0 commit 5bd024d

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ openssl x509 -in cert.pem -out cert.der -outform DER
9696

9797
## Useful links
9898

99-
* [ulogging](https://github.com/iabdalkader/micropython-ulogging)
10099
* [senml-micropython](https://github.com/kpn-iot/senml-micropython-library)
101100
* [m2crypto](https://github.com/m2crypto/m2crypto)
102101
* [umqtt.simple](https://github.com/micropython/micropython-lib/tree/master/micropython/umqtt.simple)

arduino_iot_cloud/ucloud.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
66

77
import time
8+
import logging
89
from kpn_senml import SenmlPack
910
from kpn_senml import SenmlRecord
1011
from arduino_iot_cloud.umqtt import MQTTClient
1112

1213
try:
13-
import logging
1414
import asyncio
1515
from asyncio import CancelledError
1616
from asyncio import InvalidStateError
1717
except ImportError:
18-
import ulogging as logging
1918
import uasyncio as asyncio
2019
from uasyncio.core import CancelledError
2120

arduino_iot_cloud/umqtt.py

+5-8
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,14 @@
2222
#
2323
# Based on: https://github.com/micropython/micropython-lib/tree/master/micropython/umqtt.simple
2424

25+
import socket
26+
import struct
27+
import select
28+
import logging
29+
2530
try:
2631
from ussl import wrap_socket
27-
import usocket as socket
28-
import ustruct as struct
29-
import ulogging as logging
30-
import uselect as select
3132
except ImportError:
32-
import socket
33-
import struct
34-
import logging
35-
import select
3633
from arduino_iot_cloud.ussl import wrap_socket
3734

3835

examples/micropython.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import time
55
import ussl
66
import network
7-
import ulogging as logging
8-
from ulogging.ustrftime import strftime
7+
import logging
8+
from time import strftime
99
from arduino_iot_cloud import AIOTClient
1010
from arduino_iot_cloud import Location
1111
from arduino_iot_cloud import Schedule

0 commit comments

Comments
 (0)