From b6e4e645dac67abf02c01b6f55a55ba0b84ca32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Wed, 15 Aug 2018 02:37:20 +0200 Subject: Bindings: Make generator forward compatible with Python 3 Summary: iteritems is no longer an available method for dict in Python 3. Using dict.items() is functionally identical, although it creates some overhead for Python 2.7 (creation of a temporary list). As this is only called when tracing, this is not a big issue. For Python 3, there is no overhead (dict.items() returns an iterator). Test Plan: Run python3 sip_generator.py ... Run python2 sip_generator.py ... Both generate the same code Reviewers: #frameworks, arojas Reviewed By: arojas Subscribers: arojas, kde-frameworks-devel, kde-buildsystem Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D14912 --- find-modules/rules_engine.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/find-modules/rules_engine.py b/find-modules/rules_engine.py index 8ec5ac5c..25c65a59 100755 --- a/find-modules/rules_engine.py +++ b/find-modules/rules_engine.py @@ -113,7 +113,7 @@ class Rule(object): logger.debug(_("Rule {} suppressed {}, {}").format(self, fqn, original)) else: delta = False - for k, v in original.iteritems(): + for k, v in original.items(): if v != modified[k]: delta = True break @@ -620,7 +620,7 @@ class AbstractCompiledCodeDb(object): logger.debug(_("Rule {} suppressed {}, {}").format(self, fqn, original)) else: delta = False - for k, v in original.iteritems(): + for k, v in original.items(): if v != modified[k]: delta = True break -- cgit v1.2.1