Merge "Replacing six.iteritems() with .items()"
This commit is contained in:
commit
1225a7324c
|
@ -22,7 +22,6 @@ import textwrap
|
|||
import uuid
|
||||
|
||||
import prettytable
|
||||
import six
|
||||
import yaml
|
||||
|
||||
from monascaclient import exc
|
||||
|
@ -291,6 +290,6 @@ def set_env_variables(kwargs):
|
|||
'domain_name': 'OS_DOMAIN_NAME',
|
||||
'region_name': 'OS_REGION_NAME'
|
||||
}
|
||||
for k, v in six.iteritems(environment_variables):
|
||||
for k, v in environment_variables.items():
|
||||
if k not in kwargs:
|
||||
kwargs[k] = env(v)
|
||||
|
|
Loading…
Reference in New Issue