diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-06-19 02:11:55 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-06-19 02:11:55 +0000 |
commit | 2bcd6b59a6d6848144ff9fb4f7b4c2241b907515 (patch) | |
tree | a2eaa669f8d1a81e1874d08d52de81fe9888a076 /nova/utils.py | |
parent | 966b2ade8cd8a6df8900cce9af204345636d9844 (diff) | |
parent | fc217a996a251d1c9e4f495f6d0fbf80b80700bc (diff) | |
download | nova-2bcd6b59a6d6848144ff9fb4f7b4c2241b907515.tar.gz nova-2bcd6b59a6d6848144ff9fb4f7b4c2241b907515.tar.xz nova-2bcd6b59a6d6848144ff9fb4f7b4c2241b907515.zip |
Merge "Replace utils.to_bytes() with strutils.to_bytes()"
Diffstat (limited to 'nova/utils.py')
-rw-r--r-- | nova/utils.py | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/nova/utils.py b/nova/utils.py index fe360cac6..5e968bd35 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -411,34 +411,6 @@ def utf8(value): return value -def to_bytes(text, default=0): - """Try to turn a string into a number of bytes. Looks at the last - characters of the text to determine what conversion is needed to - turn the input text into a byte number. - - Supports: B/b, K/k, M/m, G/g, T/t (or the same with b/B on the end) - - """ - # Take off everything not number 'like' (which should leave - # only the byte 'identifier' left) - mult_key_org = text.lstrip('-1234567890') - mult_key = mult_key_org.lower() - mult_key_len = len(mult_key) - if mult_key.endswith("b"): - mult_key = mult_key[0:-1] - try: - multiplier = BYTE_MULTIPLIERS[mult_key] - if mult_key_len: - # Empty cases shouldn't cause text[0:-0] - text = text[0:-mult_key_len] - return int(text) * multiplier - except KeyError: - msg = _('Unknown byte multiplier: %s') % mult_key_org - raise TypeError(msg) - except ValueError: - return default - - def get_from_path(items, path): """Returns a list of items matching the specified path. |