Handle decimal values in parse_bytes813-parse-float-bytes

Also ensure we are able to handle 64-bit integers in py2

Signed-off-by: Joffrey F <joffrey@docker.com>

2 files changed, 34 insertions, 7 deletions

diff --git a/docker/utils/utils.py b/docker/utils/utils.py
index 03b4c35..e95829a 100644
--- a/docker/utils/utils.py
+++ b/docker/utils/utils.py
@@ -460,6 +460,12 @@ def datetime_to_timestamp(dt):
     return delta.seconds + delta.days * 24 * 3600
 
 
+def longint(n):
+    if six.PY3:
+        return int(n)
+    return long(n)
+
+
 def parse_bytes(s):
     if len(s) == 0:
         s = 0
@@ -480,14 +486,20 @@ def parse_bytes(s):
 
         if suffix in units.keys() or suffix.isdigit():
             try:
-                digits = int(digits_part)
+                # Don't introduce floating point errors if the user specified
+                # an integer value.
+                if '.' in digits_part:
+                    digits = float(digits_part)
+                else:
+                    digits = longint(digits_part)
             except ValueError:
                 message = ('Failed converting the string value for'
                            'memory ({0}) to a number.')
                 formatted_message = message.format(digits_part)
                 raise errors.DockerException(formatted_message)
 
-            s = digits * units[suffix]
+            # Reconvert to long for the final result
+            s = longint(digits * units[suffix])
         else:
             message = ('The specified value for memory'
                        ' ({0}) should specify the units. The postfix'
diff --git a/tests/unit/utils_test.py b/tests/unit/utils_test.py
index a68e1e7..faf211e 100644
--- a/tests/unit/utils_test.py
+++ b/tests/unit/utils_test.py
@@ -5,6 +5,7 @@ import json
 import os
 import os.path
 import shutil
+import sys
 import tarfile
 import tempfile
 
@@ -398,14 +399,28 @@ class ParseRepositoryTagTest(base.BaseTestCase):
         )
 
 
-class UtilsTest(base.BaseTestCase):
-    longMessage = True
+class ParseBytesTest(base.BaseTestCase):
+    def test_parse_bytes_valid(self):
+        self.assertEqual(parse_bytes("512MB"), 536870912)
+        self.assertEqual(parse_bytes("512M"), 536870912)
+        self.assertEqual(parse_bytes("512m"), 536870912)
 
-    def test_parse_bytes(self):
-        self.assertEqual(parse_bytes("512MB"), (536870912))
-        self.assertEqual(parse_bytes("512M"), (536870912))
+    def test_parse_bytes_invalid(self):
         self.assertRaises(DockerException, parse_bytes, "512MK")
         self.assertRaises(DockerException, parse_bytes, "512L")
+        self.assertRaises(DockerException, parse_bytes, "127.0.0.1K")
+
+    def test_parse_bytes_float(self):
+        self.assertEqual(parse_bytes("1.5k"), 1536)
+
+    def test_parse_bytes_maxint(self):
+        self.assertEqual(
+            parse_bytes("{0}k".format(sys.maxsize)), sys.maxsize * 1024
+        )
+
+
+class UtilsTest(base.BaseTestCase):
+    longMessage = True
 
     def test_convert_filters(self):
         tests = [