From 2278ce0b95cc2d3c5fe5adae3a3055126a5b368f Mon Sep 17 00:00:00 2001
From: Chang Bo Guo <guochbo@cn.ibm.com>
Date: Sat, 7 Dec 2013 19:35:41 -0800
Subject: [PATCH] Use six.moves.queue instead of Queue

The Queue module has been renamed to queue in Python 3.
Use six.moves.queue to fit the change.

http://docs.python.org/2/library/queue.html#module-Queue

Change-Id: I2940f34d161b2e3cbc5464619f76e6adea4ef9f6
---
 oslo/messaging/_drivers/amqpdriver.py | 9 +++++----
 oslo/messaging/_drivers/impl_fake.py  | 7 ++++---
 oslo/messaging/_drivers/impl_zmq.py   | 3 +--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/oslo/messaging/_drivers/amqpdriver.py b/oslo/messaging/_drivers/amqpdriver.py
index 935d93900..511ea91dc 100644
--- a/oslo/messaging/_drivers/amqpdriver.py
+++ b/oslo/messaging/_drivers/amqpdriver.py
@@ -16,10 +16,11 @@
 __all__ = ['AMQPDriverBase']
 
 import logging
-import Queue
 import threading
 import uuid
 
+from six import moves
+
 from oslo import messaging
 from oslo.messaging._drivers import amqp as rpc_amqp
 from oslo.messaging._drivers import base
@@ -102,14 +103,14 @@ class ReplyWaiters(object):
     def get(self, msg_id, timeout):
         try:
             return self._queues[msg_id].get(block=True, timeout=timeout)
-        except Queue.Empty:
+        except moves.queue.Empty:
             raise messaging.MessagingTimeout('Timed out waiting for a reply '
                                              'to message ID %s' % msg_id)
 
     def check(self, msg_id):
         try:
             return self._queues[msg_id].get(block=False)
-        except Queue.Empty:
+        except moves.queue.Empty:
             return None
 
     def put(self, msg_id, message_data):
@@ -158,7 +159,7 @@ class ReplyWaiter(object):
         self.incoming.append(message)
 
     def listen(self, msg_id):
-        queue = Queue.Queue()
+        queue = moves.queue.Queue()
         self.waiters.add(msg_id, queue)
 
     def unlisten(self, msg_id):
diff --git a/oslo/messaging/_drivers/impl_fake.py b/oslo/messaging/_drivers/impl_fake.py
index e1f204c9c..913f6a739 100644
--- a/oslo/messaging/_drivers/impl_fake.py
+++ b/oslo/messaging/_drivers/impl_fake.py
@@ -16,10 +16,11 @@
 #    under the License.
 
 import json
-import Queue
 import threading
 import time
 
+from six import moves
+
 from oslo import messaging
 from oslo.messaging._drivers import base
 
@@ -121,7 +122,7 @@ class FakeDriver(base.BaseDriver):
 
         reply_q = None
         if wait_for_reply:
-            reply_q = Queue.Queue()
+            reply_q = moves.queue.Queue()
 
         exchange.deliver_message(target.topic, ctxt, message,
                                  server=target.server,
@@ -135,7 +136,7 @@ class FakeDriver(base.BaseDriver):
                     raise failure
                 else:
                     return reply
-            except Queue.Empty:
+            except moves.queue.Empty:
                 raise messaging.MessagingTimeout(
                     'No reply on topic %s' % target.topic)
 
diff --git a/oslo/messaging/_drivers/impl_zmq.py b/oslo/messaging/_drivers/impl_zmq.py
index 6f5ef9c46..ad52c4e1b 100644
--- a/oslo/messaging/_drivers/impl_zmq.py
+++ b/oslo/messaging/_drivers/impl_zmq.py
@@ -16,7 +16,6 @@ import collections
 import logging
 import os
 import pprint
-import Queue
 import re
 import socket
 import sys
@@ -848,7 +847,7 @@ class ZmqListener(base.Listener):
 
     def __init__(self, driver, target):
         super(ZmqListener, self).__init__(driver, target)
-        self.incoming_queue = Queue.Queue()
+        self.incoming_queue = moves.queue.Queue()
 
     def dispatch(self, ctxt, version, method, namespace, **kwargs):
         message = {