From Dan Kenigsberg <[email protected]>: Dan Kenigsberg has uploaded a new change for review.
Change subject: pylint: storage: silence errors regarding six.moves.queue ...................................................................... pylint: storage: silence errors regarding six.moves.queue six.moves is too smart for pylint. Change-Id: Iee9ac33fb94ce4fc0c6aaeb73d5e0b6434cfeffc Signed-off-by: Dan Kenigsberg <[email protected]> --- M lib/vdsm/storage/resourceManager.py M lib/vdsm/storage/threadPool.py 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/73092/1 diff --git a/lib/vdsm/storage/resourceManager.py b/lib/vdsm/storage/resourceManager.py index eb04ac8..e0a22b6 100644 --- a/lib/vdsm/storage/resourceManager.py +++ b/lib/vdsm/storage/resourceManager.py @@ -27,7 +27,7 @@ from contextlib import nested from uuid import uuid4 -from six.moves.queue import Queue +from six.moves import queue from vdsm.logUtils import SimpleLogAdapter from vdsm import concurrent @@ -456,7 +456,7 @@ except ValueError: raise TypeError("'timeout' must be number") - resource = Queue() + resource = queue.Queue() def callback(req, res): resource.put(res) diff --git a/lib/vdsm/storage/threadPool.py b/lib/vdsm/storage/threadPool.py index 17fac3a..366122f 100644 --- a/lib/vdsm/storage/threadPool.py +++ b/lib/vdsm/storage/threadPool.py @@ -13,7 +13,7 @@ import logging import threading -from six.moves.queue import Queue, Empty +from six.moves import queue from time import sleep from vdsm import concurrent @@ -40,7 +40,7 @@ self._taskThread = {} self.__resizeLock = threading.Condition(threading.Lock()) self.__runningTasksLock = threading.Condition(threading.Lock()) - self.__tasks = Queue(maxTasks) + self.__tasks = queue.Queue(maxTasks) self.__isJoining = False self.__runningTasks = 0 self.__waitTimeout = waitTimeout @@ -134,7 +134,7 @@ try: id, cmd, args, callback = self.__tasks.get(True, self.__waitTimeout) - except Empty: + except queue.Empty: pass return id, cmd, args, callback -- To view, visit https://gerrit.ovirt.org/73092 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee9ac33fb94ce4fc0c6aaeb73d5e0b6434cfeffc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <[email protected]> _______________________________________________ vdsm-patches mailing list -- [email protected] To unsubscribe send an email to [email protected]
