From 7c6c43d910e303e4c76198d59fc9ccfb25b645b5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 12 May 2017 17:25:52 +0200 Subject: [PATCH] [FIX] P3: Queue module renamed to queue --- addons/hw_escpos/controllers/main.py | 5 ++++- addons/hw_scanner/controllers/main.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py index 35efc5216ea..7e4302d7dc0 100644 --- a/addons/hw_escpos/controllers/main.py +++ b/addons/hw_escpos/controllers/main.py @@ -17,7 +17,10 @@ try: except ImportError: escpos = printer = None -from Queue import Queue +try: + from queue import Queue +except ImportError: + from Queue import Queue # pylint: disable=deprecated-module from threading import Thread, Lock try: diff --git a/addons/hw_scanner/controllers/main.py b/addons/hw_scanner/controllers/main.py index a5a3136cec8..89f1318362e 100644 --- a/addons/hw_scanner/controllers/main.py +++ b/addons/hw_scanner/controllers/main.py @@ -5,7 +5,10 @@ import logging import time from os import listdir from os.path import join -from Queue import Queue, Empty +try: + from queue import Queue, Empty +except ImportError: + from Queue import Queue, Empty # pylint: disable=deprecated-module from select import select from threading import Thread, Lock