Python 3 support: use six.iteritems

This commit is contained in:
Kamil Cholewiński 2015-04-10 11:22:16 +02:00
parent 768282f0d6
commit 3be49cfec7
2 changed files with 4 additions and 2 deletions

View File

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

View File

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