Merge lp:~lool/linaro-image-tools/no-size-suffix into lp:linaro-image-tools/11.11

[Loïc Minier]

Fixes support for --image_size without any unit specification

Suggestions on nicer constructs than ord() and int() welcome!

[Mattias Backman (mabac)]

Can you do this for the same effect?

    if unit in '0123456789':

[Loïc Minier (lool)]

I tried avoiding the full list of digits, but it's much more readable your way; pushed a version to use this

[lp:~lool/linaro-image-tools/no-size-suffix]

338. By Loïc Minier on 2011-05-06

Use nicer construct to test if a char is a digit.

[Mattias Backman (mabac)]

Looks good to me.

review: Approve

=== modified file 'linaro_image_tools/media_create/partitions.py'
--- linaro_image_tools/media_create/partitions.py	2011-04-29 11:02:39 +0000
+++ linaro_image_tools/media_create/partitions.py	2011-05-06 14:01:58 +0000
@@ -330,6 +330,9 @@
 def convert_size_to_bytes(size):
     """Convert a size string in Kbytes, Mbytes or Gbytes to bytes."""
     unit = size[-1].upper()
+    # no unit? (ends with a digit)
+    if unit in '0123456789':
+        return int(size)
     real_size = int(size[:-1])
     if unit == 'K':
         real_size = real_size * 1024

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-05-02 07:59:07 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-05-06 14:01:58 +0000
@@ -846,6 +846,9 @@
         return self._create_qemu_img_with_partitions(
             '16384,15746,0x0C,*\n32768,,,-')
 
+    def test_convert_size_no_suffix(self):
+        self.assertEqual(524288, convert_size_to_bytes('524288'))
+
     def test_convert_size_in_kbytes_to_bytes(self):
         self.assertEqual(512 * 1024, convert_size_to_bytes('512K'))