← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/image/glance.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/image/glance.py
20
20
from __future__ import absolute_import
21
21
 
22
22
import copy
23
 
import json
24
23
import random
25
24
import sys
26
25
import time
32
31
from nova import flags
33
32
from nova import log as logging
34
33
from nova.openstack.common import importutils
 
34
from nova.openstack.common import jsonutils
 
35
from nova.openstack.common import timeutils
35
36
from nova import utils
36
37
 
37
38
 
404
405
 
405
406
    for iso_format in iso_formats:
406
407
        try:
407
 
            return utils.parse_strtime(timestamp, iso_format)
 
408
            return timeutils.parse_strtime(timestamp, iso_format)
408
409
        except ValueError:
409
410
            pass
410
411
 
416
417
def _json_loads(properties, attr):
417
418
    prop = properties[attr]
418
419
    if isinstance(prop, basestring):
419
 
        properties[attr] = json.loads(prop)
 
420
        properties[attr] = jsonutils.loads(prop)
420
421
 
421
422
 
422
423
def _json_dumps(properties, attr):
423
424
    prop = properties[attr]
424
425
    if not isinstance(prop, basestring):
425
 
        properties[attr] = json.dumps(prop)
 
426
        properties[attr] = jsonutils.dumps(prop)
426
427
 
427
428
 
428
429
_CONVERT_PROPS = ('block_device_mapping', 'mappings')