diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-05-26 19:50:38 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2014-05-26 19:50:38 +0300 |
| commit | 386c9c7c55147b27c258edd5deee36594553493d (patch) | |
| tree | d50b1554106a1f17a1f5402fdece81cc570bd873 /mediagoblin/plugins | |
| parent | 7f342c72f64594775bac1bcce81b32ae9e18e6ac (diff) | |
| download | mediagoblin-386c9c7c55147b27c258edd5deee36594553493d.tar.lz mediagoblin-386c9c7c55147b27c258edd5deee36594553493d.tar.xz mediagoblin-386c9c7c55147b27c258edd5deee36594553493d.zip | |
Use six.iteritems() instead of dict.iteritems().
Diffstat (limited to 'mediagoblin/plugins')
| -rw-r--r-- | mediagoblin/plugins/ldap/tools.py | 4 | ||||
| -rw-r--r-- | mediagoblin/plugins/piwigo/tools.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/plugins/ldap/tools.py b/mediagoblin/plugins/ldap/tools.py index 1c436792..2be2dcd7 100644 --- a/mediagoblin/plugins/ldap/tools.py +++ b/mediagoblin/plugins/ldap/tools.py @@ -16,6 +16,8 @@ import ldap import logging +import six + from mediagoblin.tools import pluginapi _log = logging.getLogger(__name__) @@ -47,7 +49,7 @@ class LDAP(object): return email def login(self, username, password): - for k, v in self.ldap_settings.iteritems(): + for k, v in six.iteritems(self.ldap_settings): try: self._connect(v) user_dn = v['LDAP_USER_DN_TEMPLATE'].format(username=username) diff --git a/mediagoblin/plugins/piwigo/tools.py b/mediagoblin/plugins/piwigo/tools.py index 484ea531..7b9b7af3 100644 --- a/mediagoblin/plugins/piwigo/tools.py +++ b/mediagoblin/plugins/piwigo/tools.py @@ -47,7 +47,7 @@ class PwgNamedArray(list): def _fill_element_dict(el, data, as_attr=()): - for k, v in data.iteritems(): + for k, v in six.iteritems(data): if k in as_attr: if not isinstance(v, six.string_types): v = str(v) |