Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
synnefo
Commits
6a2df5cd
Commit
6a2df5cd
authored
Mar 24, 2011
by
Giorgos Verigakis
Browse files
Use the json module bundled by Django
parent
8bccf812
Changes
5
Show whitespace changes
Inline
Side-by-side
api/flavors.py
View file @
6a2df5cd
...
...
@@ -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'
,
...
...
api/images.py
View file @
6a2df5cd
...
...
@@ -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'
,
...
...
api/servers.py
View file @
6a2df5cd
...
...
@@ -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
)
...
...
api/tests_redux.py
View file @
6a2df5cd
...
...
@@ -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'
...
...
api/util.py
View file @
6a2df5cd
...
...
@@ -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'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment