summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-25 10:44:05 +0000
committerGerrit Code Review <review@openstack.org>2016-10-25 10:44:05 +0000
commit0b63d5d5868309612a4b2dc48d9ee7e5eeba61ea (patch)
treed88364441cf21a6bc169585cae4331910906953d /openstackclient
parent824ed8490f626b906f85f7c8f19055e53923db5f (diff)
parentacc39673abfc6cd953628dbea94eb65ad2c9b361 (diff)
downloadpython-openstackclient-0b63d5d5868309612a4b2dc48d9ee7e5eeba61ea.tar.gz
Merge "Rename variable to avoid shadowing of built-in name"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/functional/base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/tests/functional/base.py b/openstackclient/tests/functional/base.py
index 298b2454..885abc02 100644
--- a/openstackclient/tests/functional/base.py
+++ b/openstackclient/tests/functional/base.py
@@ -63,8 +63,8 @@ class TestCase(testtools.TestCase):
return cls.openstack('extension list ' + opts)
@classmethod
- def get_opts(cls, fields, format='value'):
- return ' -f {0} {1}'.format(format,
+ def get_opts(cls, fields, output_format='value'):
+ return ' -f {0} {1}'.format(output_format,
' '.join(['-c ' + it for it in fields]))
@classmethod