From cd381cd71466158b34160fc0519db9f1c5870af4 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Sun, 9 Oct 2016 16:34:32 +0800 Subject: [PATCH] bitbake: COW.py: fix sample codes The call of methods iteritems() and itervalues() in sample codes were replaced by items() and values() to convert to Python 3 by Bitbake rev d0f904d407f57998419bd9c305ce53e5eaa36b24. But the methods iteritems() and itervalues() belong to class COWDictMeta not class dict or set. The modifications should not be made in purpose that it fails to run sample codes, so revert them. (Bitbake rev: d140f0ee6f301264e226914766d9f63558acfd6c) Signed-off-by: Kai Kang Signed-off-by: Richard Purdie --- bitbake/lib/bb/COW.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bitbake/lib/bb/COW.py b/bitbake/lib/bb/COW.py index 77a05cfe35..36ebbd9d19 100644 --- a/bitbake/lib/bb/COW.py +++ b/bitbake/lib/bb/COW.py @@ -213,11 +213,11 @@ if __name__ == "__main__": print() print("a", a) - for x in a.items(): + for x in a.iteritems(): print(x) print("--") print("b", b) - for x in b.items(): + for x in b.iteritems(): print(x) print() @@ -225,11 +225,11 @@ if __name__ == "__main__": b['a'] = 'c' print("a", a) - for x in a.items(): + for x in a.iteritems(): print(x) print("--") print("b", b) - for x in b.items(): + for x in b.iteritems(): print(x) print() @@ -244,22 +244,22 @@ if __name__ == "__main__": a['set'].add("o2") print("a", a) - for x in a['set'].values(): + for x in a['set'].itervalues(): print(x) print("--") print("b", b) - for x in b['set'].values(): + for x in b['set'].itervalues(): print(x) print() b['set'].add('o3') print("a", a) - for x in a['set'].values(): + for x in a['set'].itervalues(): print(x) print("--") print("b", b) - for x in b['set'].values(): + for x in b['set'].itervalues(): print(x) print() @@ -269,7 +269,7 @@ if __name__ == "__main__": a['set2'].add("o2") print("a", a) - for x in a.items(): + for x in a.iteritems(): print(x) print("--") print("b", b) @@ -289,7 +289,7 @@ if __name__ == "__main__": print("Yay - has_key with delete works!") print("a", a) - for x in a.items(): + for x in a.iteritems(): print(x) print("--") print("b", b) @@ -300,7 +300,7 @@ if __name__ == "__main__": b.__revertitem__('b') print("a", a) - for x in a.items(): + for x in a.iteritems(): print(x) print("--") print("b", b) @@ -310,7 +310,7 @@ if __name__ == "__main__": b.__revertitem__('dict') print("a", a) - for x in a.items(): + for x in a.iteritems(): print(x) print("--") print("b", b)