diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2015-05-20 15:37:22 -0700 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2015-05-20 15:37:22 -0700 |
| commit | 7b2fd8cf5ef3bbcbecd190eba39a33b3708ff33b (patch) | |
| tree | 86f8238e1162edc23abea8d63ee073a5fe10f296 /docker/utils | |
| parent | 08444cf355bd782913776f9da1041384d7c8c7a1 (diff) | |
| parent | ef452ed4c1161a0b71369be7c86e450fd41b52f8 (diff) | |
| download | docker-py-7b2fd8cf5ef3bbcbecd190eba39a33b3708ff33b.tar.gz | |
Merge pull request #562 from smothiki/mems
make memory units compatible with native docker cli
Diffstat (limited to 'docker/utils')
| -rw-r--r-- | docker/utils/utils.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py index bca88de..4110017 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -322,6 +322,9 @@ def parse_bytes(s): if len(s) == 0: s = 0 else: + if s[-2:-1].isalpha() and s[-1].isalpha(): + if (s[-1] == "b" or s[-1] == "B"): + s = s[:-1] units = BYTE_UNITS suffix = s[-1].lower() |