esp_local_ctrl/scripts: Removed python2 compatibility

examples/protocols/esp_local_ctrl/scripts/proto_lc.py

@@ -1,34 +1,24 @@
-# Copyright 2018 Espressif Systems (Shanghai) PTE LTD
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-License-Identifier: Apache-2.0
 #
 
-
-from __future__ import print_function
-
+import importlib.util
 import os
-
-from future.utils import tobytes
+import sys
+from importlib.abc import Loader
+from typing import Any
 
 
-def _load_source(name, path):
-    try:
-        from importlib.machinery import SourceFileLoader
-        return SourceFileLoader(name, path).load_module()
-    except ImportError:
-        # importlib.machinery doesn't exists in Python 2 so we will use imp (deprecated in Python 3)
-        import imp
-        return imp.load_source(name, path)
+def _load_source(name: str, path: str) -> Any:
+    spec = importlib.util.spec_from_file_location(name, path)
+    if not spec:
+        return None
+
+    module = importlib.util.module_from_spec(spec)
+    sys.modules[spec.name] = module
+    assert isinstance(spec.loader, Loader)
+    spec.loader.exec_module(module)
+    return module
 
 
 idf_path = os.environ['IDF_PATH']
@@ -36,6 +26,10 @@ constants_pb2 = _load_source('constants_pb2', idf_path + '/components/protocomm/
 local_ctrl_pb2 = _load_source('esp_local_ctrl_pb2', idf_path + '/components/esp_local_ctrl/python/esp_local_ctrl_pb2.py')
 
 
+def to_bytes(s: str) -> bytes:
+    return bytes(s, encoding='latin-1')
+
+
 def get_prop_count_request(security_ctx):
     req = local_ctrl_pb2.LocalCtrlMessage()
     req.msg = local_ctrl_pb2.TypeCmdGetPropertyCount
@@ -46,7 +40,7 @@ def get_prop_count_request(security_ctx):
 
 
 def get_prop_count_response(security_ctx, response_data):
-    decrypt = security_ctx.decrypt_data(tobytes(response_data))
+    decrypt = security_ctx.decrypt_data(to_bytes(response_data))
     resp = local_ctrl_pb2.LocalCtrlMessage()
     resp.ParseFromString(decrypt)
     if (resp.resp_get_prop_count.status == 0):
@@ -66,7 +60,7 @@ def get_prop_vals_request(security_ctx, indices):
 
 
 def get_prop_vals_response(security_ctx, response_data):
-    decrypt = security_ctx.decrypt_data(tobytes(response_data))
+    decrypt = security_ctx.decrypt_data(to_bytes(response_data))
     resp = local_ctrl_pb2.LocalCtrlMessage()
     resp.ParseFromString(decrypt)
     results = []
@@ -76,7 +70,7 @@ def get_prop_vals_response(security_ctx, response_data):
                 'name': prop.name,
                 'type': prop.type,
                 'flags': prop.flags,
-                'value': tobytes(prop.value)
+                'value': prop.value
             }]
     return results
 
@@ -95,7 +89,7 @@ def set_prop_vals_request(security_ctx, indices, values):
 
 
 def set_prop_vals_response(security_ctx, response_data):
-    decrypt = security_ctx.decrypt_data(tobytes(response_data))
+    decrypt = security_ctx.decrypt_data(to_bytes(response_data))
     resp = local_ctrl_pb2.LocalCtrlMessage()
     resp.ParseFromString(decrypt)
     return (resp.resp_set_prop_vals.status == 0)