On Thu, 2019-01-24 at 16:45 +0900, Masashi Honma wrote:
> This patch is made by using 2to3 command with some modifications.
>
> $ find . -name *.py | xargs 2to3 -f imports -w -n
>
> Signed-off-by: Masashi Honma <masashi.honma@xxxxxxxxx>
> ---
> tests/hwsim/p2p_utils.py | 9 +-
> tests/hwsim/test_ap_eap.py | 5 +-
> tests/hwsim/test_ap_wps.py | 148 ++++++++++++++-------------
> tests/hwsim/test_p2p_wifi_display.py | 5 +-
> 4 files changed, 92 insertions(+), 75 deletions(-)
>
> diff --git a/tests/hwsim/p2p_utils.py b/tests/hwsim/p2p_utils.py
> index 1a4646dc7..6c8a3cc4b 100644
> --- a/tests/hwsim/p2p_utils.py
> +++ b/tests/hwsim/p2p_utils.py
> @@ -8,7 +8,10 @@ import logging
> logger = logging.getLogger()
> import threading
> import time
> -import Queue
> +try:
> + from Queue import Queue
> +except ImportError:
> + from queue import Queue
>
> import hwsim_utils
>
> @@ -238,7 +241,7 @@ def go_neg_pin(i_dev, r_dev, i_intent=None, r_intent=None, i_method='enter', r_m
> pin = r_dev.wps_read_pin()
> logger.info("Start GO negotiation " + i_dev.ifname + " -> " + r_dev.ifname)
> r_dev.dump_monitor()
> - res = Queue.Queue()
> + res = queue.Queue()
This doesn't look right?
You imported "from queue import Queue" so you should use Queue() not
queue.Queue()?
Or use
try:
import Queue as queue
except:
import queue
?
johannes
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
