From 9d82a3aa0cca1a85687ee8490f9dbac6347bf5b5 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <a.badger@gmail.com>
Date: Sun, 23 Oct 2016 22:14:46 -0700
Subject: Fix the uri testserver to run on python3

(cherry picked from commit 589e71dbc5c9e7fd4bd83c6cbc6d8fab15f134f7)
---
 test/integration/roles/test_uri/files/testserver.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/integration/roles/test_uri/files/testserver.py b/test/integration/roles/test_uri/files/testserver.py
index d0d24a0050..1488c814af 100644
--- a/test/integration/roles/test_uri/files/testserver.py
+++ b/test/integration/roles/test_uri/files/testserver.py
@@ -1,7 +1,17 @@
-import mimetypes
+import sys
 
 if __name__ == '__main__':
-    mimetypes.init()
-    mimetypes.add_type('application/json', '.json')
-    import SimpleHTTPServer
-    SimpleHTTPServer.test()
+    if sys.version_info[0] >= 3:
+        import http.server
+        import socketserver
+        PORT = int(sys.argv[1])
+        Handler = http.server.SimpleHTTPRequestHandler
+        httpd = socketserver.TCPServer(("", PORT), Handler)
+        httpd.serve_forever()
+    else:
+        import mimetypes
+        mimetypes.init()
+        mimetypes.add_type('application/json', '.json')
+        import SimpleHTTPServer
+        SimpleHTTPServer.test()
+
-- 
cgit v1.2.1