From 3be49cfec7c2549a4050af84bd1838a053fb7f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Cholewi=C5=84ski?= Date: Fri, 10 Apr 2015 11:22:16 +0200 Subject: [PATCH] Python 3 support: use six.iteritems --- boltons/funcutils.py | 3 ++- boltons/statsutils.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/boltons/funcutils.py b/boltons/funcutils.py index 9be1d6f..9ffad01 100644 --- a/boltons/funcutils.py +++ b/boltons/funcutils.py @@ -10,6 +10,7 @@ import sys import functools from types import MethodType, FunctionType from itertools import chain +from six import iteritems def get_module_callables(mod, ignore=None): @@ -49,7 +50,7 @@ def mro_items(type_obj): ['denominator', 'imag', 'numerator', 'real'] """ # TODO: handle slots? - return chain.from_iterable([ct.__dict__.iteritems() + return chain.from_iterable([iteritems(ct.__dict__) for ct in type_obj.__mro__]) diff --git a/boltons/statsutils.py b/boltons/statsutils.py index 4e4a14b..740412e 100644 --- a/boltons/statsutils.py +++ b/boltons/statsutils.py @@ -86,6 +86,7 @@ system instrumentation package. from __future__ import print_function from math import floor, ceil +from six import iteritems class _StatsProperty(object): @@ -382,7 +383,7 @@ def _get_conv_func(attr_name): return stats_helper -for attr_name, attr in Stats.__dict__.items(): +for attr_name, attr in list(iteritems(Stats.__dict__)): if isinstance(attr, _StatsProperty): func = _get_conv_func(attr_name) func.__doc__ = attr.func.__doc__