libs: Fix the exception caused by missing ssl module.

Signed-off-by: lbuque <[email protected]>

Author: lbuque

m5stack/boards/manifest.py

@@ -10,6 +10,7 @@
 include("$(MPY_DIR)/extmod/asyncio")
 require("webrepl")
 require("upysh")
+require("ssl")
 
 # freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
 # freeze("$(MPY_DIR)/ports/esp8266/modules", "ntptime.py")

m5stack/libs/requests2/__init__.py

@@ -1,4 +1,4 @@
-import usocket
+import socket
 
 
 class Response:
@@ -48,11 +48,11 @@ def request(
     chunked_data = data and getattr(data, "__next__", None) and not getattr(data, "__len__", None)
 
     if auth is not None:
-        import ubinascii
+        import binascii
 
         username, password = auth
         formated = b"{}:{}".format(username, password)
-        formated = str(ubinascii.b2a_base64(formated)[:-1], "ascii")
+        formated = str(binascii.b2a_base64(formated)[:-1], "ascii")
         headers["Authorization"] = "Basic {}".format(formated)
 
     try:
@@ -63,7 +63,7 @@ def request(
     if proto == "http:":
         port = 80
     elif proto == "https:":
-        import ussl
+        import ssl
 
         port = 443
     else:
@@ -73,14 +73,14 @@ def request(
         host, port = host.split(":", 1)
         port = int(port)
 
-    ai = usocket.getaddrinfo(host, port, 0, usocket.SOCK_STREAM)
+    ai = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)
     ai = ai[0]
 
     resp_d = None
     if parse_headers is not False:
         resp_d = {}
 
-    s = usocket.socket(ai[0], usocket.SOCK_STREAM, ai[2])
+    s = socket.socket(ai[0], socket.SOCK_STREAM, ai[2])
 
     if timeout is not None:
         # Note: settimeout is not supported on all platforms, will raise
@@ -90,7 +90,7 @@ def request(
     try:
         s.connect(ai[-1])
         if proto == "https:":
-            s = ussl.wrap_socket(s, server_hostname=host)
+            s = ssl.wrap_socket(s, server_hostname=host)
         s.write(b"%s /%s HTTP/1.0\r\n" % (method, path))
         if "Host" not in headers:
             s.write(b"Host: %s\r\n" % host)

m5stack/libs/umqtt/simple.py

@@ -2,9 +2,8 @@
 #
 # SPDX-License-Identifier: MIT
 
-import usocket as socket
-import ustruct as struct
-from ubinascii import hexlify
+import socket
+import struct
 
 
 class MQTTException(Exception):
@@ -71,9 +70,9 @@ def connect(self, clean_session=True):
         addr = socket.getaddrinfo(self.server, self.port)[0][-1]
         self.sock.connect(addr)
         if self.ssl:
-            import ussl
+            import ssl
 
-            self.sock = ussl.wrap_socket(self.sock, **self.ssl_params)
+            self.sock = ssl.wrap_socket(self.sock, **self.ssl_params)
         premsg = bytearray(b"\x10\0\0\0\0\0")
         msg = bytearray(b"\x04MQTT\x04\x02\0\0")
 
@@ -100,7 +99,6 @@ def connect(self, clean_session=True):
 
         self.sock.write(premsg, i + 2)
         self.sock.write(msg)
-        # print(hex(len(msg)), hexlify(msg, ":"))
         self._send_str(self.client_id)
         if self.lw_topic:
             self._send_str(self.lw_topic)
@@ -140,7 +138,6 @@ def publish(self, topic, msg, retain=False, qos=0):
             sz >>= 7
             i += 1
         pkt[i] = sz
-        # print(hex(len(pkt)), hexlify(pkt, ":"))
         self.sock.write(pkt, i + 1)
         self._send_str(topic)
         if qos > 0:
@@ -167,7 +164,6 @@ def subscribe(self, topic, qos=0):
         pkt = bytearray(b"\x82\0\0\0")
         self.pid += 1
         struct.pack_into("!BH", pkt, 1, 2 + 2 + len(topic) + 1, self.pid)
-        # print(hex(len(pkt)), hexlify(pkt, ":"))
         self.sock.write(pkt)
         self._send_str(topic)
         self.sock.write(qos.to_bytes(1, "little"))