From 8894c577536f9f1d0b09690cb2a8dde26175df6d Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <a.badger@gmail.com>
Date: Mon, 7 Aug 2017 18:52:33 -0700
Subject: [PATCH] Fix rabbitmq modules for python3 import

Also get rid of unnecessary capture of exception into a variable for
python-2.4 compat.
---
 .../modules/messaging/rabbitmq_binding.py      | 18 +++++++++---------
 .../modules/messaging/rabbitmq_exchange.py     |  9 +++++----
 .../modules/messaging/rabbitmq_queue.py        |  7 ++++---
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/ansible/modules/messaging/rabbitmq_binding.py b/lib/ansible/modules/messaging/rabbitmq_binding.py
index d01589ea07..2cd9d77665 100644
--- a/lib/ansible/modules/messaging/rabbitmq_binding.py
+++ b/lib/ansible/modules/messaging/rabbitmq_binding.py
@@ -103,15 +103,15 @@ EXAMPLES = '''
 '''
 
 import json
-import urllib
 
 try:
     import requests
     HAS_REQUESTS = True
-except ImportError as e:
+except ImportError:
     HAS_REQUESTS = False
 
 from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.six.moves.urllib import parse as urllib_parse
 
 
 def main():
@@ -143,15 +143,15 @@ def main():
     if module.params['routing_key'] == "":
         props = "~"
     else:
-        props = urllib.quote(module.params['routing_key'],'')
+        props = urllib_parse.quote(module.params['routing_key'],'')
 
     url = "http://%s:%s/api/bindings/%s/e/%s/%s/%s/%s" % (
         module.params['login_host'],
         module.params['login_port'],
-        urllib.quote(module.params['vhost'],''),
-        urllib.quote(module.params['name'],''),
+        urllib_parse.quote(module.params['vhost'],''),
+        urllib_parse.quote(module.params['name'],''),
         dest_type,
-        urllib.quote(module.params['destination'],''),
+        urllib_parse.quote(module.params['destination'],''),
         props
     )
 
@@ -190,10 +190,10 @@ def main():
             url = "http://%s:%s/api/bindings/%s/e/%s/%s/%s" % (
                 module.params['login_host'],
                 module.params['login_port'],
-                urllib.quote(module.params['vhost'],''),
-                urllib.quote(module.params['name'],''),
+                urllib_parse.quote(module.params['vhost'],''),
+                urllib_parse.quote(module.params['name'],''),
                 dest_type,
-                urllib.quote(module.params['destination'],'')
+                urllib_parse.quote(module.params['destination'],'')
             )
 
             r = requests.post(
diff --git a/lib/ansible/modules/messaging/rabbitmq_exchange.py b/lib/ansible/modules/messaging/rabbitmq_exchange.py
index 0851dbf1a9..897887f945 100644
--- a/lib/ansible/modules/messaging/rabbitmq_exchange.py
+++ b/lib/ansible/modules/messaging/rabbitmq_exchange.py
@@ -105,14 +105,15 @@ EXAMPLES = '''
 '''
 
 import json
+
 try:
     import requests
     HAS_REQUESTS = True
-except ImportError as e:
+except ImportError:
     HAS_REQUESTS = False
-import urllib
 
 from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.six.moves.urllib import parse as urllib_parse
 
 
 def main():
@@ -137,8 +138,8 @@ def main():
     url = "http://%s:%s/api/exchanges/%s/%s" % (
         module.params['login_host'],
         module.params['login_port'],
-        urllib.quote(module.params['vhost'],''),
-        urllib.quote(module.params['name'],'')
+        urllib_parse.quote(module.params['vhost'],''),
+        urllib_parse.quote(module.params['name'],'')
     )
 
     if not HAS_REQUESTS:
diff --git a/lib/ansible/modules/messaging/rabbitmq_queue.py b/lib/ansible/modules/messaging/rabbitmq_queue.py
index 97e962870c..7688f86ecd 100644
--- a/lib/ansible/modules/messaging/rabbitmq_queue.py
+++ b/lib/ansible/modules/messaging/rabbitmq_queue.py
@@ -120,14 +120,15 @@ EXAMPLES = '''
 '''
 
 import json
+
 try:
     import requests
     HAS_REQUESTS = True
-except ImportError as e:
+except ImportError:
     HAS_REQUESTS = False
-import urllib
 
 from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.six.moves.urllib import parse as urllib_parse
 
 
 def main():
@@ -155,7 +156,7 @@ def main():
     url = "http://%s:%s/api/queues/%s/%s" % (
         module.params['login_host'],
         module.params['login_port'],
-        urllib.quote(module.params['vhost'],''),
+        urllib_parse.quote(module.params['vhost'],''),
         module.params['name']
     )