From: Jay S. Bryant <jsbryant@us.ibm.com>
Date: Fri, 19 Dec 2014 20:10:33 +0000 (-0600)
Subject: Sync latest imageutils from oslo-incubator
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6ef23f8b3d2a4e438ee661692a0a81c4ef5fa451;p=openstack-build%2Fcinder-build.git

Sync latest imageutils from oslo-incubator

Performing a sync as imageutils has not been updated since late
in the Icehouse release cycle.

Current HEAD in OSLO:
---------------------
commit 36b0e8570b449129d6d474c03b02ceb62edb78df
Date:   Thu Dec 11 11:27:08 2014 +0100
We shouldn't replace `oslo-incubator` in comments

Change being merged with this patch:
---------------------
b2d35eec - Use list.pop(0) to keep the code simpler

Change-Id: If15f311db093f05fc97568bdcc5f7ad8ea8abddf
---

diff --git a/cinder/openstack/common/imageutils.py b/cinder/openstack/common/imageutils.py
index e8a19e244..bdb8263d0 100644
--- a/cinder/openstack/common/imageutils.py
+++ b/cinder/openstack/common/imageutils.py
@@ -21,8 +21,9 @@ Helper methods to deal with images.
 
 import re
 
-from cinder.openstack.common.gettextutils import _
-from cinder.openstack.common import strutils
+from oslo.utils import strutils
+
+from cinder.openstack.common._i18n import _
 
 
 class QemuImgInfo(object):
@@ -62,7 +63,7 @@ class QemuImgInfo(object):
         # Standardize on underscores/lc/no dash and no spaces
         # since qemu seems to have mixed outputs here... and
         # this format allows for better integration with python
-        # - ie for usage in kwargs and such...
+        # - i.e. for usage in kwargs and such...
         field = field.lower().strip()
         for c in (" ", "-"):
             field = field.replace(c, '_')
@@ -100,10 +101,9 @@ class QemuImgInfo(object):
             real_details = real_details.strip().lower()
         elif root_cmd == 'snapshot_list':
             # Next line should be a header, starting with 'ID'
-            if not lines_after or not lines_after[0].startswith("ID"):
+            if not lines_after or not lines_after.pop(0).startswith("ID"):
                 msg = _("Snapshot list encountered but no header found!")
                 raise ValueError(msg)
-            del lines_after[0]
             real_details = []
             # This is the sprintf pattern we will try to match
             # "%-10s%-20s%7s%20s%15s"
@@ -118,6 +118,7 @@ class QemuImgInfo(object):
                 date_pieces = line_pieces[5].split(":")
                 if len(date_pieces) != 3:
                     break
+                lines_after.pop(0)
                 real_details.append({
                     'id': line_pieces[0],
                     'tag': line_pieces[1],
@@ -125,7 +126,6 @@ class QemuImgInfo(object):
                     'date': line_pieces[3],
                     'vm_clock': line_pieces[4] + " " + line_pieces[5],
                 })
-                del lines_after[0]
         return real_details
 
     def _parse(self, cmd_output):