2 files changed, 29 insertions, 29 deletions
diff --git a/meta/lib/oeqa/selftest/pkgdata.py b/meta/lib/oeqa/selftest/pkgdata.py
index 138b03aadb..5a63f89ff2 100644
--- a/meta/lib/oeqa/selftest/pkgdata.py
+++ b/meta/lib/oeqa/selftest/pkgdata.py
@@ -131,15 +131,15 @@ class OePkgdataUtilTests(oeSelfTest):
        # Test recipe-space package name
        result = runCmd('oe-pkgdata-util list-pkg-files zlib-dev zlib-doc')
        files = splitoutput(result.output)
-        self.assertIn('zlib-dev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib-doc', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
        self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev'])
        self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc'])
        # Test runtime package name
        result = runCmd('oe-pkgdata-util list-pkg-files -r libz1 libz-dev')
        files = splitoutput(result.output)
-        self.assertIn('libz1', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz-dev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
        self.assertGreater(len(files['libz1']), 1)
        libspec = os.path.join(base_libdir, 'libz.so.1.*')
        found = False
@@ -152,12 +152,12 @@ class OePkgdataUtilTests(oeSelfTest):
        # Test recipe
        result = runCmd('oe-pkgdata-util list-pkg-files -p zlib')
        files = splitoutput(result.output)
-        self.assertIn('zlib-dbg', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib-doc', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib-dev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib-staticdev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertNotIn('zlib-locale', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertNotIn('zlib-locale', list(files.keys()), "listed pkgs. files: %s" %result.output)
        # (ignore ptest, might not be there depending on config)
        self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev'])
        self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc'])
@@ -165,36 +165,36 @@ class OePkgdataUtilTests(oeSelfTest):
        # Test recipe, runtime
        result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r')
        files = splitoutput(result.output)
-        self.assertIn('libz-dbg', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz-doc', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz-dev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz-staticdev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz1', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertNotIn('libz-locale', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertNotIn('libz-locale', list(files.keys()), "listed pkgs. files: %s" %result.output)
        self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev'])
        self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc'])
        self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev'])
        # Test recipe, unpackaged
        result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -u')
        files = splitoutput(result.output)
-        self.assertIn('zlib-dbg', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib-doc', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib-dev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib-staticdev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('zlib', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('zlib-locale', files.keys(), "listed pkgs. files: %s" %result.output) # this is the key one
+        self.assertIn('zlib-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) # this is the key one
        self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev'])
        self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc'])
        self.assertIn(os.path.join(libdir, 'libz.a'), files['zlib-staticdev'])
        # Test recipe, runtime, unpackaged
        result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r -u')
        files = splitoutput(result.output)
-        self.assertIn('libz-dbg', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz-doc', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz-dev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz-staticdev', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz1', files.keys(), "listed pkgs. files: %s" %result.output)
+        self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output)
-        self.assertIn('libz-locale', files.keys(), "listed pkgs. files: %s" %result.output) # this is the key one
+        self.assertIn('libz-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) # this is the key one
        self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev'])
        self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc'])
        self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev'])
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index f51de99458..c1d07d9b41 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -22,7 +22,7 @@ import logging
 logger = logging.getLogger("BitBake.QemuRunner")
 # Get Unicode non printable control chars
-control_range = range(0,32)+range(127,160)
+control_range = list(range(0,32))+list(range(127,160))
 control_chars = [unichr(x) for x in control_range
                if unichr(x) not in string.printable]
 re_control_char = re.compile('[%s]' % re.escape("".join(control_chars)))

diff --git a/meta/lib/oeqa/selftest/pkgdata.py b/meta/lib/oeqa/selftest/pkgdata.py index 138b03aadb..5a63f89ff2 100644 --- a/meta/lib/oeqa/selftest/pkgdata.py +++ b/meta/lib/oeqa/selftest/pkgdata.py
@@ -131,15 +131,15 @@ class OePkgdataUtilTests(oeSelfTest):
131	# Test recipe-space package name	131	# Test recipe-space package name
132	result = runCmd('oe-pkgdata-util list-pkg-files zlib-dev zlib-doc')	132	result = runCmd('oe-pkgdata-util list-pkg-files zlib-dev zlib-doc')
133	files = splitoutput(result.output)	133	files = splitoutput(result.output)
134	self.assertIn('zlib-dev', files.keys(), "listed pkgs. files: %s" %result.output)	134	self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
135	self.assertIn('zlib-doc', files.keys(), "listed pkgs. files: %s" %result.output)	135	self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
136	self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev'])	136	self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev'])
137	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc'])	137	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc'])
138	# Test runtime package name	138	# Test runtime package name
139	result = runCmd('oe-pkgdata-util list-pkg-files -r libz1 libz-dev')	139	result = runCmd('oe-pkgdata-util list-pkg-files -r libz1 libz-dev')
140	files = splitoutput(result.output)	140	files = splitoutput(result.output)
141	self.assertIn('libz1', files.keys(), "listed pkgs. files: %s" %result.output)	141	self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output)
142	self.assertIn('libz-dev', files.keys(), "listed pkgs. files: %s" %result.output)	142	self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
143	self.assertGreater(len(files['libz1']), 1)	143	self.assertGreater(len(files['libz1']), 1)
144	libspec = os.path.join(base_libdir, 'libz.so.1.*')	144	libspec = os.path.join(base_libdir, 'libz.so.1.*')
145	found = False	145	found = False
@@ -152,12 +152,12 @@ class OePkgdataUtilTests(oeSelfTest):
152	# Test recipe	152	# Test recipe
153	result = runCmd('oe-pkgdata-util list-pkg-files -p zlib')	153	result = runCmd('oe-pkgdata-util list-pkg-files -p zlib')
154	files = splitoutput(result.output)	154	files = splitoutput(result.output)
155	self.assertIn('zlib-dbg', files.keys(), "listed pkgs. files: %s" %result.output)	155	self.assertIn('zlib-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output)
156	self.assertIn('zlib-doc', files.keys(), "listed pkgs. files: %s" %result.output)	156	self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
157	self.assertIn('zlib-dev', files.keys(), "listed pkgs. files: %s" %result.output)	157	self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
158	self.assertIn('zlib-staticdev', files.keys(), "listed pkgs. files: %s" %result.output)	158	self.assertIn('zlib-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output)
159	self.assertIn('zlib', files.keys(), "listed pkgs. files: %s" %result.output)	159	self.assertIn('zlib', list(files.keys()), "listed pkgs. files: %s" %result.output)
160	self.assertNotIn('zlib-locale', files.keys(), "listed pkgs. files: %s" %result.output)	160	self.assertNotIn('zlib-locale', list(files.keys()), "listed pkgs. files: %s" %result.output)
161	# (ignore ptest, might not be there depending on config)	161	# (ignore ptest, might not be there depending on config)
162	self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev'])	162	self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev'])
163	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc'])	163	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc'])
@@ -165,36 +165,36 @@ class OePkgdataUtilTests(oeSelfTest):
165	# Test recipe, runtime	165	# Test recipe, runtime
166	result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r')	166	result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r')
167	files = splitoutput(result.output)	167	files = splitoutput(result.output)
168	self.assertIn('libz-dbg', files.keys(), "listed pkgs. files: %s" %result.output)	168	self.assertIn('libz-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output)
169	self.assertIn('libz-doc', files.keys(), "listed pkgs. files: %s" %result.output)	169	self.assertIn('libz-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
170	self.assertIn('libz-dev', files.keys(), "listed pkgs. files: %s" %result.output)	170	self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
171	self.assertIn('libz-staticdev', files.keys(), "listed pkgs. files: %s" %result.output)	171	self.assertIn('libz-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output)
172	self.assertIn('libz1', files.keys(), "listed pkgs. files: %s" %result.output)	172	self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output)
173	self.assertNotIn('libz-locale', files.keys(), "listed pkgs. files: %s" %result.output)	173	self.assertNotIn('libz-locale', list(files.keys()), "listed pkgs. files: %s" %result.output)
174	self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev'])	174	self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev'])
175	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc'])	175	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc'])
176	self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev'])	176	self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev'])
177	# Test recipe, unpackaged	177	# Test recipe, unpackaged
178	result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -u')	178	result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -u')
179	files = splitoutput(result.output)	179	files = splitoutput(result.output)
180	self.assertIn('zlib-dbg', files.keys(), "listed pkgs. files: %s" %result.output)	180	self.assertIn('zlib-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output)
181	self.assertIn('zlib-doc', files.keys(), "listed pkgs. files: %s" %result.output)	181	self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
182	self.assertIn('zlib-dev', files.keys(), "listed pkgs. files: %s" %result.output)	182	self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
183	self.assertIn('zlib-staticdev', files.keys(), "listed pkgs. files: %s" %result.output)	183	self.assertIn('zlib-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output)
184	self.assertIn('zlib', files.keys(), "listed pkgs. files: %s" %result.output)	184	self.assertIn('zlib', list(files.keys()), "listed pkgs. files: %s" %result.output)
185	self.assertIn('zlib-locale', files.keys(), "listed pkgs. files: %s" %result.output) # this is the key one	185	self.assertIn('zlib-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) # this is the key one
186	self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev'])	186	self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev'])
187	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc'])	187	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc'])
188	self.assertIn(os.path.join(libdir, 'libz.a'), files['zlib-staticdev'])	188	self.assertIn(os.path.join(libdir, 'libz.a'), files['zlib-staticdev'])
189	# Test recipe, runtime, unpackaged	189	# Test recipe, runtime, unpackaged
190	result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r -u')	190	result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r -u')
191	files = splitoutput(result.output)	191	files = splitoutput(result.output)
192	self.assertIn('libz-dbg', files.keys(), "listed pkgs. files: %s" %result.output)	192	self.assertIn('libz-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output)
193	self.assertIn('libz-doc', files.keys(), "listed pkgs. files: %s" %result.output)	193	self.assertIn('libz-doc', list(files.keys()), "listed pkgs. files: %s" %result.output)
194	self.assertIn('libz-dev', files.keys(), "listed pkgs. files: %s" %result.output)	194	self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output)
195	self.assertIn('libz-staticdev', files.keys(), "listed pkgs. files: %s" %result.output)	195	self.assertIn('libz-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output)
196	self.assertIn('libz1', files.keys(), "listed pkgs. files: %s" %result.output)	196	self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output)
197	self.assertIn('libz-locale', files.keys(), "listed pkgs. files: %s" %result.output) # this is the key one	197	self.assertIn('libz-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) # this is the key one
198	self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev'])	198	self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev'])
199	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc'])	199	self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc'])
200	self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev'])	200	self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev'])


diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index f51de99458..c1d07d9b41 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -22,7 +22,7 @@ import logging
22	logger = logging.getLogger("BitBake.QemuRunner")	22	logger = logging.getLogger("BitBake.QemuRunner")
23		23
24	# Get Unicode non printable control chars	24	# Get Unicode non printable control chars
25	control_range = range(0,32)+range(127,160)	25	control_range = list(range(0,32))+list(range(127,160))
26	control_chars = [unichr(x) for x in control_range	26	control_chars = [unichr(x) for x in control_range
27	if unichr(x) not in string.printable]	27	if unichr(x) not in string.printable]
28	re_control_char = re.compile('[%s]' % re.escape("".join(control_chars)))	28	re_control_char = re.compile('[%s]' % re.escape("".join(control_chars)))