From 9cf81750b97dad7af667234d0a06d609b26970c9 Mon Sep 17 00:00:00 2001 From: Chen Yu Dong Date: Thu, 29 Oct 2020 15:44:28 +0800 Subject: [PATCH] bugfix: import error in example tests --- examples/bluetooth/nimble/blehr/blehr_test.py | 6 +++++- .../ota/advanced_https_ota/example_test.py | 16 ++++++++++------ .../ota/native_ota_example/example_test.py | 14 +++++++++----- .../ota/simple_ota_example/example_test.py | 11 ++++++++--- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/examples/bluetooth/nimble/blehr/blehr_test.py b/examples/bluetooth/nimble/blehr/blehr_test.py index 59e7cdb9b7..b338cfe046 100644 --- a/examples/bluetooth/nimble/blehr/blehr_test.py +++ b/examples/bluetooth/nimble/blehr/blehr_test.py @@ -19,13 +19,17 @@ import os import re import threading import traceback -import Queue import subprocess from tiny_test_fw import Utility import ttfw_idf from ble import lib_ble_client +try: + import Queue +except ImportError: + import queue as Queue + # When running on local machine execute the following before running this script # > make app bootloader # > make print_flash_cmd | tail -n 1 > build/download.config diff --git a/examples/system/ota/advanced_https_ota/example_test.py b/examples/system/ota/advanced_https_ota/example_test.py index 0638595e56..2dc528398b 100644 --- a/examples/system/ota/advanced_https_ota/example_test.py +++ b/examples/system/ota/advanced_https_ota/example_test.py @@ -1,8 +1,6 @@ import re import os import socket -import BaseHTTPServer -import SimpleHTTPServer from threading import Thread import ssl @@ -11,6 +9,13 @@ import ttfw_idf import random import subprocess +try: + import BaseHTTPServer + from SimpleHTTPServer import SimpleHTTPRequestHandler +except ImportError: + import http.server as BaseHTTPServer + from http.server import SimpleHTTPRequestHandler + server_cert = "-----BEGIN CERTIFICATE-----\n" \ "MIIDXTCCAkWgAwIBAgIJAP4LF7E72HakMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\n"\ "BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\n"\ @@ -99,7 +104,7 @@ def https_request_handler(): """ Returns a request handler class that handles broken pipe exception """ - class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): + class RequestHandler(SimpleHTTPRequestHandler): def finish(self): try: if not self.wfile.closed: @@ -121,8 +126,7 @@ def https_request_handler(): def start_https_server(ota_image_dir, server_ip, server_port): server_file, key_file = get_ca_cert(ota_image_dir) requestHandler = https_request_handler() - httpd = BaseHTTPServer.HTTPServer((server_ip, server_port), - requestHandler) + httpd = BaseHTTPServer.HTTPServer((server_ip, server_port), requestHandler) httpd.socket = ssl.wrap_socket(httpd.socket, keyfile=key_file, @@ -140,7 +144,7 @@ def redirect_handler_factory(url): """ Returns a request handler class that redirects to supplied `url` """ - class RedirectHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): + class RedirectHandler(SimpleHTTPRequestHandler): def do_GET(self): print("Sending resp, URL: " + url) self.send_response(301) diff --git a/examples/system/ota/native_ota_example/example_test.py b/examples/system/ota/native_ota_example/example_test.py index 68f8202277..b9f3b13b38 100644 --- a/examples/system/ota/native_ota_example/example_test.py +++ b/examples/system/ota/native_ota_example/example_test.py @@ -1,8 +1,6 @@ import re import os import socket -import BaseHTTPServer -import SimpleHTTPServer from threading import Thread import ssl @@ -11,6 +9,13 @@ import ttfw_idf import random import subprocess +try: + import BaseHTTPServer + from SimpleHTTPServer import SimpleHTTPRequestHandler +except ImportError: + import http.server as BaseHTTPServer + from http.server import SimpleHTTPRequestHandler + server_cert = "-----BEGIN CERTIFICATE-----\n" \ "MIIDXTCCAkWgAwIBAgIJAP4LF7E72HakMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\n"\ "BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\n"\ @@ -99,7 +104,7 @@ def https_request_handler(): """ Returns a request handler class that handles broken pipe exception """ - class RequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): + class RequestHandler(SimpleHTTPRequestHandler): def finish(self): try: if not self.wfile.closed: @@ -121,8 +126,7 @@ def https_request_handler(): def start_https_server(ota_image_dir, server_ip, server_port): server_file, key_file = get_ca_cert(ota_image_dir) requestHandler = https_request_handler() - httpd = BaseHTTPServer.HTTPServer((server_ip, server_port), - requestHandler) + httpd = BaseHTTPServer.HTTPServer((server_ip, server_port), requestHandler) httpd.socket = ssl.wrap_socket(httpd.socket, keyfile=key_file, diff --git a/examples/system/ota/simple_ota_example/example_test.py b/examples/system/ota/simple_ota_example/example_test.py index ff1cea95b5..79fc6cd3dd 100644 --- a/examples/system/ota/simple_ota_example/example_test.py +++ b/examples/system/ota/simple_ota_example/example_test.py @@ -1,14 +1,19 @@ import re import os import socket -import BaseHTTPServer -import SimpleHTTPServer from threading import Thread import ssl from tiny_test_fw import DUT import ttfw_idf +try: + import BaseHTTPServer + from SimpleHTTPServer import SimpleHTTPRequestHandler +except ImportError: + import http.server as BaseHTTPServer + from http.server import SimpleHTTPRequestHandler + server_cert = "-----BEGIN CERTIFICATE-----\n" \ "MIIDXTCCAkWgAwIBAgIJAP4LF7E72HakMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\n"\ "BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\n"\ @@ -87,7 +92,7 @@ def start_https_server(ota_image_dir, server_ip, server_port): key_file_handle.close() httpd = BaseHTTPServer.HTTPServer((server_ip, server_port), - SimpleHTTPServer.SimpleHTTPRequestHandler) + SimpleHTTPRequestHandler) httpd.socket = ssl.wrap_socket(httpd.socket, keyfile=key_file,