Commit 85b0e12a authored by Faidon Liambotis's avatar Faidon Liambotis
Browse files

Use Python 2.6's json in util/

This was fixed with a237869 but "broken" again via the pull of new RAPI
version from Ganeti (067dda9)
parent cb06dc86
......@@ -34,12 +34,16 @@
# be standalone.
import logging
import simplejson
import socket
import urllib
import threading
import pycurl
import simplejson as json
except ImportError:
import json
from cStringIO import StringIO
except ImportError:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment