diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-05 13:17:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-05 13:17:47 +0000 |
| commit | 6a6ba06ec02316c9cb4484dbcd0472805b0a1720 (patch) | |
| tree | e5658a8caae69bb97a8b37133ed8aac5f336b1f3 | |
| parent | ff05a5e29f11e9a3957191afa91dde42a3d1fe3b (diff) | |
| parent | d99353c44d540963688976e26bf16f1d12b77a6d (diff) | |
| download | oslo-i18n-6a6ba06ec02316c9cb4484dbcd0472805b0a1720.tar.gz | |
Merge "Replace six.iteritems() with .items()"
| -rw-r--r-- | oslo_i18n/_gettextutils.py | 3 | ||||
| -rw-r--r-- | oslo_i18n/_translate.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/oslo_i18n/_gettextutils.py b/oslo_i18n/_gettextutils.py index 75a8313..8d78376 100644 --- a/oslo_i18n/_gettextutils.py +++ b/oslo_i18n/_gettextutils.py @@ -22,7 +22,6 @@ import gettext import os from babel import localedata -import six from oslo_i18n import _factory from oslo_i18n import _locale @@ -82,7 +81,7 @@ def get_available_languages(domain): 'zh_Hant': 'zh_TW', 'fil': 'tl_PH'} - language_list.extend(alias for locale, alias in six.iteritems(aliases) + language_list.extend(alias for locale, alias in aliases.items() if (locale in language_list and alias not in language_list)) diff --git a/oslo_i18n/_translate.py b/oslo_i18n/_translate.py index 1809e1e..4592196 100644 --- a/oslo_i18n/_translate.py +++ b/oslo_i18n/_translate.py @@ -68,6 +68,6 @@ def translate_args(args, desired_locale=None): return tuple(translate(v, desired_locale) for v in args) if isinstance(args, dict): translated_dict = dict((key, translate(value, desired_locale)) - for key, value in six.iteritems(args)) + for key, value in args.items()) return translated_dict return translate(args, desired_locale) |