Python 3 fix for func_name
Python 3 fix for iteritems