From 5bdb5b7c6c5ab992f5b0fa227d242d532b1487a5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 10 Sep 2018 20:44:16 +0530
Subject: [PATCH] Import fixes for the setup package

---
 setup/publish.py            |  3 +--
 setup/win-ci.py             |  9 ++++++---
 src/polyglot/http_server.py | 13 +++++++++++++
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 src/polyglot/http_server.py

diff --git a/setup/publish.py b/setup/publish.py
index fef57a0d4e..d1edbf9d3e 100644
--- a/setup/publish.py
+++ b/setup/publish.py
@@ -241,8 +241,7 @@ class Manual(Command):
 
     def serve_manual(self, root):
         os.chdir(root)
-        import BaseHTTPServer
-        from SimpleHTTPServer import SimpleHTTPRequestHandler
+        from polyglot.http_server import BaseHTTPServer, SimpleHTTPRequestHandler
         HandlerClass = SimpleHTTPRequestHandler
         ServerClass = BaseHTTPServer.HTTPServer
         Protocol = "HTTP/1.0"
diff --git a/setup/win-ci.py b/setup/win-ci.py
index 9813d9c330..c159acc715 100644
--- a/setup/win-ci.py
+++ b/setup/win-ci.py
@@ -11,10 +11,13 @@ import sys
 import tarfile
 import time
 
-try:
-    import _winreg as winreg
-except ImportError:
+if sys.version_info.major > 2:
     import winreg
+else:
+    try:
+        import _winreg as winreg
+    except ImportError:
+        import winreg
 is64bit = os.environ.get('PLATFORM') != 'x86'
 
 
diff --git a/src/polyglot/http_server.py b/src/polyglot/http_server.py
new file mode 100644
index 0000000000..e49d886569
--- /dev/null
+++ b/src/polyglot/http_server.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python2
+# vim:fileencoding=utf-8
+# License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
+
+from __future__ import absolute_import, division, print_function, unicode_literals
+
+from polyglot.builtins import is_py3
+
+if is_py3:
+    from http.server import BaseHTTPServer, SimpleHTTPRequestHandler
+else:
+    import BaseHTTPServer  # noqa
+    from SimpleHTTPServer import SimpleHTTPRequestHandler  # noqa