Merge "Replacing six.iteritems() with .items()"

This commit is contained in:
Jenkins 2017-04-11 16:45:09 +00:00 committed by Gerrit Code Review
commit 1225a7324c
1 changed files with 1 additions and 2 deletions

View File

@ -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)