From 7923eb31534701344fc44a46c7041237bee56b22 Mon Sep 17 00:00:00 2001 From: Per A Brodtkorb Date: Sun, 14 Feb 2016 02:23:36 +0100 Subject: [PATCH] Replaced iteritems with a python 3 compatible iterable dict items. --- wafo/powerpoint.py | 3 ++- wafo/tests/test_misc.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wafo/powerpoint.py b/wafo/powerpoint.py index cc742c1..ffa151a 100644 --- a/wafo/powerpoint.py +++ b/wafo/powerpoint.py @@ -31,6 +31,7 @@ Created on 15. des. 2009 # typelib_mso.lcid, # int(typelib_mso.major), int(typelib_mso.minor)) from __future__ import absolute_import +from six import iteritems # @UnresolvedImport import os import warnings import win32com.client @@ -172,7 +173,7 @@ class Powerpoint(object): def _add_text_from_dict(self, page, id, txt_dict, # @ReservedAssignment level, maxlevel=None): if maxlevel is None or level <= maxlevel: - for name, subdict in txt_dict.iteritems(): + for name, subdict in iteritems(txt_dict): tr = page.Shapes(id).TextFrame.TextRange.InsertAfter(name) unused_temp = page.Shapes( id).TextFrame.TextRange.InsertAfter('\r') diff --git a/wafo/tests/test_misc.py b/wafo/tests/test_misc.py index c595f4d..6f5e6f2 100644 --- a/wafo/tests/test_misc.py +++ b/wafo/tests/test_misc.py @@ -1,4 +1,4 @@ - +from six import iteritems from numpy.testing import (run_module_suite, assert_equal, assert_almost_equal, assert_array_equal, assert_array_almost_equal, TestCase, assert_, assert_raises,) @@ -372,7 +372,7 @@ def test_getshipchar(): service_speed=10, service_speedSTD=0) - for name, val in true_sc.iteritems(): + for name, val in iteritems(true_sc): assert_almost_equal(val, sc[name])