diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-18 21:39:44 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:24:01 +0100 |
| commit | 7eab022d4b484aec40998f95835ba46c5da168cf (patch) | |
| tree | e88a3bf01eada7d44e41bfadee5721ce6ec198e0 /scripts/contrib/python | |
| parent | 63404baadbfd1225bbb955f8c8f817073aef65d8 (diff) | |
| download | poky-7eab022d4b484aec40998f95835ba46c5da168cf.tar.gz | |
scripts: Fix deprecated dict methods for python3
Replaced iteritems -> items, itervalues -> values,
iterkeys -> keys or 'in'
(From OE-Core rev: 25d4d8274bac696a484f83d7f3ada778cf95f4d0)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib/python')
| -rwxr-xr-x | scripts/contrib/python/generate-manifest-2.7.py | 4 | ||||
| -rwxr-xr-x | scripts/contrib/python/generate-manifest-3.5.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py index 48be3a6d74..f2ecf8d3f5 100755 --- a/scripts/contrib/python/generate-manifest-2.7.py +++ b/scripts/contrib/python/generate-manifest-2.7.py | |||
| @@ -97,7 +97,7 @@ class MakefileMaker: | |||
| 97 | # generate package variables | 97 | # generate package variables |
| 98 | # | 98 | # |
| 99 | 99 | ||
| 100 | for name, data in sorted(self.packages.iteritems()): | 100 | for name, data in sorted(self.packages.items()): |
| 101 | desc, deps, files = data | 101 | desc, deps, files = data |
| 102 | 102 | ||
| 103 | # | 103 | # |
| @@ -130,7 +130,7 @@ class MakefileMaker: | |||
| 130 | self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) | 130 | self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) |
| 131 | line = 'RDEPENDS_${PN}-modules="' | 131 | line = 'RDEPENDS_${PN}-modules="' |
| 132 | 132 | ||
| 133 | for name, data in sorted(self.packages.iteritems()): | 133 | for name, data in sorted(self.packages.items()): |
| 134 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev']: | 134 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev']: |
| 135 | line += "%s " % name | 135 | line += "%s " % name |
| 136 | 136 | ||
diff --git a/scripts/contrib/python/generate-manifest-3.5.py b/scripts/contrib/python/generate-manifest-3.5.py index a7b38d202a..41f209b17f 100755 --- a/scripts/contrib/python/generate-manifest-3.5.py +++ b/scripts/contrib/python/generate-manifest-3.5.py | |||
| @@ -100,7 +100,7 @@ class MakefileMaker: | |||
| 100 | # generate package variables | 100 | # generate package variables |
| 101 | # | 101 | # |
| 102 | 102 | ||
| 103 | for name, data in sorted(self.packages.iteritems()): | 103 | for name, data in sorted(self.packages.items()): |
| 104 | desc, deps, files = data | 104 | desc, deps, files = data |
| 105 | 105 | ||
| 106 | # | 106 | # |
| @@ -133,7 +133,7 @@ class MakefileMaker: | |||
| 133 | self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) | 133 | self.out( 'SUMMARY_${PN}-modules="All Python modules"' ) |
| 134 | line = 'RDEPENDS_${PN}-modules="' | 134 | line = 'RDEPENDS_${PN}-modules="' |
| 135 | 135 | ||
| 136 | for name, data in sorted(self.packages.iteritems()): | 136 | for name, data in sorted(self.packages.items()): |
| 137 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev']: | 137 | if name not in ['${PN}-dev', '${PN}-distutils-staticdev']: |
| 138 | line += "%s " % name | 138 | line += "%s " % name |
| 139 | 139 | ||
