summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2016-01-04 17:11:27 -0800
committerDylan Baker <baker.dylan.c@gmail.com>2016-02-08 12:29:33 -0800
commit6904155a0f6e7c8e0ecd1e56aedfc24ecf371144 (patch)
tree914cab50c8b931caa6f47d4f9690c385bf5f2ec5
parent6f17fcbbeea14a37117fbb049c5aa1865d6e5196 (diff)
framework: use six.moves.BaseHTTPServer
This is another shim for something that moved between python3 and python2. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Acked-by: Jose Fonseca <jfonseca@vmware.com>
-rw-r--r--framework/log.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/log.py b/framework/log.py
index 5bd69027f..704ab0524 100644
--- a/framework/log.py
+++ b/framework/log.py
@@ -32,13 +32,14 @@ import abc
import itertools
import threading
import collections
-from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
try:
import simplejson as json
except ImportError:
import json
+from six.moves.BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
+
from framework.core import PIGLIT_CONFIG
from framework import grouptools