Commit 6a2df5cd authored by Giorgos Verigakis's avatar Giorgos Verigakis
Browse files

Use the json module bundled by Django

parent 8bccf812
......@@ -8,6 +8,7 @@ from synnefo.db.models import Flavor
from django.conf.urls.defaults import *
from django.http import HttpResponse
from django.template.loader import render_to_string
from django.utils import simplejson as json
urlpatterns = patterns('synnefo.api.flavors',
......
......@@ -8,6 +8,7 @@ from synnefo.db.models import Image
from django.conf.urls.defaults import *
from django.http import HttpResponse
from django.template.loader import render_to_string
from django.utils import simplejson as json
urlpatterns = patterns('synnefo.api.images',
......
......@@ -12,11 +12,10 @@ from django.conf import settings
from django.conf.urls.defaults import *
from django.http import HttpResponse
from django.template.loader import render_to_string
from django.utils import simplejson as json
from logging import getLogger
import json
log = getLogger('synnefo.api.servers')
rapi = GanetiRapiClient(*settings.GANETI_CLUSTER_INFO)
......
......@@ -4,8 +4,8 @@
from django.test import TestCase
from django.test.client import Client
from django.utils import simplejson as json
import json
API = 'v1.1redux'
......
......@@ -7,6 +7,7 @@ from synnefo.db.models import *
from django.http import HttpResponse
from django.template.loader import render_to_string
from django.utils import simplejson as json
from functools import wraps
from logging import getLogger
......@@ -16,8 +17,6 @@ from traceback import format_exc
from xml.etree import ElementTree
from xml.parsers.expat import ExpatError
import json
log = getLogger('synnefo.api')
......
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