← Back to branch summary

~tr3buchet/nova/lock

« back to all changes in this revision

Viewing changes to nova/image/glance.py

  • Committer: Vishvananda Ishaya
  • Date: 2010-12-22 20:59:53 UTC
  • mto: This revision was merged to the branch mainline in revision 482.
  • Revision ID: vishvananda@gmail.com-20101222205953-j2j5t0qjwlcd0t2s
merge trunk and upgrade to cheetah templating

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/image/glance.py
77
77
                data = json.loads(res.read())['images']
78
78
                return data
79
79
            else:
80
 
                logging.warn("Parallax returned HTTP error %d from "
81
 
                             "request for /images", res.status_int)
 
80
                logging.warn(_("Parallax returned HTTP error %d from "
 
81
                               "request for /images"), res.status_int)
82
82
                return []
83
83
        finally:
84
84
            c.close()
96
96
                data = json.loads(res.read())['images']
97
97
                return data
98
98
            else:
99
 
                logging.warn("Parallax returned HTTP error %d from "
100
 
                             "request for /images/detail", res.status_int)
 
99
                logging.warn(_("Parallax returned HTTP error %d from "
 
100
                               "request for /images/detail"), res.status_int)
101
101
                return []
102
102
        finally:
103
103
            c.close()