diff options
| author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2014-07-14 08:40:34 -0400 |
|---|---|---|
| committer | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2014-07-15 15:03:33 -0400 |
| commit | 380903a686e10f46f9beeabbaa2f4ecb86f57e94 (patch) | |
| tree | 74b9e4340186933ea87f9d2fa12a7af52b718acd | |
| parent | 4eecd25bed9a47fa358ff0e1b4d925532e5f5be8 (diff) | |
| download | oslo-utils-380903a686e10f46f9beeabbaa2f4ecb86f57e94.tar.gz | |
Move units into oslo.utils
bp graduate-oslo-utils
Change-Id: I022dd51c9c9a59462ad94380c6ea7fbc0d145613
| -rw-r--r-- | openstack-common.conf | 1 | ||||
| -rw-r--r-- | oslo/utils/units.py (renamed from oslo/utils/openstack/common/units.py) | 4 | ||||
| -rw-r--r-- | tests/test_strutils.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/openstack-common.conf b/openstack-common.conf index 80ba376..237d387 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -7,4 +7,3 @@ script = tools/run_cross_tests.sh base=oslo.utils module=gettextutils -module=units diff --git a/oslo/utils/openstack/common/units.py b/oslo/utils/units.py index 84b518c..4817da5 100644 --- a/oslo/utils/openstack/common/units.py +++ b/oslo/utils/units.py @@ -17,7 +17,7 @@ Unit constants """ -#Binary unit constants. +# Binary unit constants. Ki = 1024 Mi = 1024 ** 2 Gi = 1024 ** 3 @@ -27,7 +27,7 @@ Ei = 1024 ** 6 Zi = 1024 ** 7 Yi = 1024 ** 8 -#Decimal unit constants. +# Decimal unit constants. k = 1000 M = 1000 ** 2 G = 1000 ** 3 diff --git a/tests/test_strutils.py b/tests/test_strutils.py index 4b37b21..c6bd6c8 100644 --- a/tests/test_strutils.py +++ b/tests/test_strutils.py @@ -22,8 +22,8 @@ from oslotest import base as test_base import six import testscenarios -from oslo.utils.openstack.common import units from oslo.utils import strutils +from oslo.utils import units load_tests = testscenarios.load_tests_apply_scenarios |