Revision 29a59bc1

b/api/flavors.py
8 8
from django.conf.urls.defaults import *
9 9
from django.http import HttpResponse
10 10
from django.template.loader import render_to_string
11
from django.utils import simplejson as json
11 12

  
12 13

  
13 14
urlpatterns = patterns('synnefo.api.flavors',
b/api/images.py
8 8
from django.conf.urls.defaults import *
9 9
from django.http import HttpResponse
10 10
from django.template.loader import render_to_string
11
from django.utils import simplejson as json
11 12

  
12 13

  
13 14
urlpatterns = patterns('synnefo.api.images',
b/api/servers.py
12 12
from django.conf.urls.defaults import *
13 13
from django.http import HttpResponse
14 14
from django.template.loader import render_to_string
15
from django.utils import simplejson as json
15 16

  
16 17
from logging import getLogger
17 18

  
18
import json
19

  
20 19

  
21 20
log = getLogger('synnefo.api.servers')
22 21
rapi = GanetiRapiClient(*settings.GANETI_CLUSTER_INFO)
b/api/tests_redux.py
4 4

  
5 5
from django.test import TestCase
6 6
from django.test.client import Client
7
from django.utils import simplejson as json
7 8

  
8
import json
9 9

  
10 10
API = 'v1.1redux'
11 11

  
b/api/util.py
7 7

  
8 8
from django.http import HttpResponse
9 9
from django.template.loader import render_to_string
10
from django.utils import simplejson as json
10 11

  
11 12
from functools import wraps
12 13
from logging import getLogger
......
16 17
from xml.etree import ElementTree
17 18
from xml.parsers.expat import ExpatError
18 19

  
19
import json
20

  
21 20

  
22 21
log = getLogger('synnefo.api')
23 22

  

Also available in: Unified diff