Change in vdsm[master]: pylint: storage: silence errors regarding six.moves.queue

[Code Review]

From Dan Kenigsberg :

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 
---
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

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: pylint: storage: silence errors regarding six.moves.queue
......................................................................

Patch Set 1:

ci please build

[Code Review]

From Dan Kenigsberg :

Dan Kenigsberg has posted comments on this change.

Change subject: pylint: storage: silence errors regarding six.moves.queue
......................................................................

Patch Set 1: Verified+1

passes http://jenkins.ovirt.org/view/oVirt%20system%20tests/job/ovirt-system-tests_...