From 5d5c6f4e4f37069e4929652043afa34c0b27a371 Mon Sep 17 00:00:00 2001 From: Luong Anh Tuan Date: Wed, 12 Oct 2016 11:49:21 +0700 Subject: [PATCH] Use six.moves.range for Python 3 The function xrange() was renamed to range() in Python 3. Use "from six.moves import range" to get xrange() on Python 2 and range() on Python 3 as the name "range", and replace "xrange()" with "range()". The import is omitted for small ranges (1024 items or less). This patch was generated by the following tool (revision 0c1d096b3903) with the "xrange" operation: https://bitbucket.org/haypo/misc/src/tip/python/sixer.py Manual change: * Replace range(n) with list(range(n)) in a loop of nova/virt/libvirt/driver.py which uses list.pop() Blueprint nova-python3 Change-Id: Ifc264fe262982b62d9791cedef6040eecc8af04e --- monasca_common/tests/validation/test_metric_validation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monasca_common/tests/validation/test_metric_validation.py b/monasca_common/tests/validation/test_metric_validation.py index 95d66600..ce062259 100644 --- a/monasca_common/tests/validation/test_metric_validation.py +++ b/monasca_common/tests/validation/test_metric_validation.py @@ -14,6 +14,7 @@ # limitations under the License. import monasca_common.validation.metrics as metric_validator +from six.moves import range import unittest # a few valid characters to test @@ -359,7 +360,7 @@ class TestMetricValidation(unittest.TestCase): "timestamp": 1405630174123, "value": 2.0} ] - for i in xrange(len(metrics)): + for i in range(len(metrics)): metric_validator.validate_name(metrics[i]['name']) metric_validator.validate_value(metrics[i]['value']) metric_validator.validate_timestamp(metrics[i]['timestamp'])