python2 vs python3 import location for BaseHTTPRequestHandler

git-svn-id: https://xpra.org/svn/Xpra/trunk@21570 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Feb 7, 2019 · bf66f3d · bf66f3d
1 parent beee60b
commit bf66f3d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/xpra/server/http_handler.py b/src/xpra/server/http_handler.py
@@ -11,7 +11,11 @@
     from urllib import unquote          #python2 @UnusedImport
 except ImportError:
     from urllib.parse import unquote    #python3 @Reimport @UnresolvedImport
-from http.server import BaseHTTPRequestHandler
+try:
+    from BaseHTTPServer import BaseHTTPRequestHandler   #python2 @UnusedImport
+except:
+
+    from http.server import BaseHTTPRequestHandler      #python3 @Reimport @UnresolvedImport
 
 from xpra.util import envbool, std, AdHocStruct
 from xpra.os_util import PYTHON2