← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/api/openstack/wsgi.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/wsgi.py
16
16
#    under the License.
17
17
 
18
18
import inspect
 
19
import math
 
20
import time
19
21
from xml.dom import minidom
20
22
from xml.parsers import expat
21
 
import math
22
 
import time
23
23
 
24
24
from lxml import etree
25
25
import webob
26
26
 
27
27
from nova import exception
28
28
from nova import log as logging
29
 
from nova import utils
 
29
from nova.openstack.common import jsonutils
30
30
from nova import wsgi
31
31
 
32
32
 
130
130
 
131
131
    def _from_json(self, datastring):
132
132
        try:
133
 
            return utils.loads(datastring)
 
133
            return jsonutils.loads(datastring)
134
134
        except ValueError:
135
135
            msg = _("cannot understand JSON")
136
136
            raise exception.MalformedRequestBody(reason=msg)
242
242
    """Default JSON request body serialization"""
243
243
 
244
244
    def default(self, data):
245
 
        return utils.dumps(data)
 
245
        return jsonutils.dumps(data)
246
246
 
247
247
 
248
248
class XMLDictSerializer(DictSerializer):
533
533
    """Determine action to invoke."""
534
534
 
535
535
    try:
536
 
        decoded = utils.loads(body)
 
536
        decoded = jsonutils.loads(body)
537
537
    except ValueError:
538
538
        msg = _("cannot understand JSON")
539
539
        raise exception.MalformedRequestBody(reason=msg)