diff options
author | Cyril Roelandt <cyril.roelandt@enovance.com> | 2014-03-18 12:47:16 +0100 |
---|---|---|
committer | Cyril Roelandt <cyril.roelandt@enovance.com> | 2014-03-18 12:47:16 +0100 |
commit | 6b05262f502d3ad7365d84c4b45cd974417ae89a (patch) | |
tree | 4cc6999c1a7aa27a8c7370233d3111ec4b8aea11 | |
parent | 3f3daafc688316314edda93d467c8565dc662c81 (diff) | |
download | paste-git-6b05262f502d3ad7365d84c4b45cd974417ae89a.tar.gz |
Python 3: Replace "for ... in dict.items()" with "for ... in six.iteritems(dict)"
Same change for itervalues().
-rw-r--r-- | paste/httpheaders.py | 6 | ||||
-rw-r--r-- | paste/registry.py | 5 | ||||
-rw-r--r-- | paste/util/multidict.py | 17 | ||||
-rw-r--r-- | tests/test_multidict.py | 4 |
4 files changed, 17 insertions, 15 deletions
diff --git a/paste/httpheaders.py b/paste/httpheaders.py index 2a11f6d..7c57c29 100644 --- a/paste/httpheaders.py +++ b/paste/httpheaders.py @@ -171,7 +171,7 @@ REQUEST_METHOD = EnvironVariable("REQUEST_METHOD") SCRIPT_NAME = EnvironVariable("SCRIPT_NAME") PATH_INFO = EnvironVariable("PATH_INFO") -for _name, _obj in globals().items(): +for _name, _obj in six.iteritems(globals()): if isinstance(_obj, EnvironVariable): __all__.append(_name) @@ -740,7 +740,7 @@ class _CacheControl(_MultiValueHeader): result.append('max-age=%d' % max_age) if s_maxage is not None: result.append('s-maxage=%d' % s_maxage) - for (k, v) in extensions.items(): + for (k, v) in six.iteritems(extensions): if k not in self.extensions: raise AssertionError("unexpected extension used: '%s'" % k) result.append('%s="%s"' % (k.replace("_", "-"), v)) @@ -1099,6 +1099,6 @@ for head in _headers.values(): __all__.append(headname) __pudge_all__ = __all__[:] -for _name, _obj in globals().items(): +for _name, _obj in six.iteritems(globals()): if isinstance(_obj, type) and issubclass(_obj, HTTPHeader): __pudge_all__.append(_name) diff --git a/paste/registry.py b/paste/registry.py index 4c0e2b0..61a5d13 100644 --- a/paste/registry.py +++ b/paste/registry.py @@ -89,6 +89,7 @@ is provided solely in the extremely rare case that it is an issue so that a quick way to work around it is documented. """ +import six import sys import paste.util.threadinglocal as threadinglocal @@ -345,7 +346,7 @@ class Registry(object): def cleanup(self): """Remove all objects from all StackedObjectProxy instances that were tracked at this Registry context""" - for stacked, obj in self.reglist[-1].itervalues(): + for stacked, obj in six.itervalues(self.reglist[-1]): stacked._pop_object(obj) self.reglist.pop() @@ -505,7 +506,7 @@ class StackedObjectRestorer(object): # their methods to act differently when a restoration context is active # in the current thread for reglist in registry.reglist: - for stacked, obj in reglist.itervalues(): + for stacked, obj in six.itervalues(reglist): self.enable_restoration(stacked) def get_saved_proxied_obj(self, stacked, request_id): diff --git a/paste/util/multidict.py b/paste/util/multidict.py index d81cce0..eb32e53 100644 --- a/paste/util/multidict.py +++ b/paste/util/multidict.py @@ -2,6 +2,7 @@ # Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php import cgi import copy +import six import sys try: @@ -25,15 +26,15 @@ class MultiDict(DictMixin): "MultiDict can only be called with one positional argument") if args: if hasattr(args[0], 'iteritems'): - items = list(args[0].iteritems()) + items = args[0].iteritems() elif hasattr(args[0], 'items'): items = args[0].items() else: - items = list(args[0]) - self._items = items + items = args[0] + self._items = list(items) else: self._items = [] - self._items.extend(kw.iteritems()) + self._items.extend(six.iteritems(kw)) def __getitem__(self, key): for k, v in self._items: @@ -295,7 +296,7 @@ class UnicodeMultiDict(DictMixin): request. """ unicode_mixed = {} - for key, value in self.multi.mixed().iteritems(): + for key, value in six.iteritems(self.multi.mixed()): if isinstance(value, list): value = [self._decode_value(value) for value in value] else: @@ -309,7 +310,7 @@ class UnicodeMultiDict(DictMixin): list of values. """ unicode_dict = {} - for key, value in self.multi.dict_of_lists().iteritems(): + for key, value in six.iteritems(self.multi.dict_of_lists()): value = [self._decode_value(value) for value in value] unicode_dict[self._decode_key(key)] = value return unicode_dict @@ -360,10 +361,10 @@ class UnicodeMultiDict(DictMixin): def items(self): return [(self._decode_key(k), self._decode_value(v)) for \ - k, v in self.multi.iteritems()] + k, v in six.iteritems(self.multi)] def iteritems(self): - for k, v in self.multi.iteritems(): + for k, v in six.iteritems(self.multi): yield (self._decode_key(k), self._decode_value(v)) def values(self): diff --git a/tests/test_multidict.py b/tests/test_multidict.py index b43d168..820331e 100644 --- a/tests/test_multidict.py +++ b/tests/test_multidict.py @@ -128,9 +128,9 @@ def _test_unicode_dict(decode_param_names=False): assert d.dict_of_lists() == {u'a': [u'a test'], u'y': [u'y test'], u'z': [item]} del d['z'] - map(assert_unicode_item, d.mixed().iteritems()) + map(assert_unicode_item, six.iteritems(d.mixed())) map(assert_unicode_item, [(k, v[0]) for \ - k, v in d.dict_of_lists().iteritems()]) + k, v in six.iteritems(d.dict_of_lists())]) assert u'a' in d dcopy = d.copy() |