diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-connectivity/ofono/ofono.inc | 6 | ||||
-rw-r--r-- | meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch | 1270 | ||||
-rw-r--r-- | meta/recipes-connectivity/ofono/ofono_1.17.bb | 1 |
3 files changed, 5 insertions, 1272 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index c415a39981..72bbcacbd5 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc | |||
@@ -26,6 +26,10 @@ SYSTEMD_SERVICE_${PN} = "ofono.service" | |||
26 | do_install_append() { | 26 | do_install_append() { |
27 | install -d ${D}${sysconfdir}/init.d/ | 27 | install -d ${D}${sysconfdir}/init.d/ |
28 | install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono | 28 | install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono |
29 | |||
30 | # Ofono still has one test tool that refers to Python 2 in the shebang | ||
31 | sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/ofono/test/set-ddr | ||
32 | |||
29 | } | 33 | } |
30 | 34 | ||
31 | PACKAGES =+ "${PN}-tests" | 35 | PACKAGES =+ "${PN}-tests" |
@@ -34,4 +38,4 @@ RDEPENDS_${PN} += "dbus" | |||
34 | 38 | ||
35 | FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}" | 39 | FILES_${PN} += "${base_libdir}/udev ${systemd_unitdir}" |
36 | FILES_${PN}-tests = "${libdir}/${BPN}/test" | 40 | FILES_${PN}-tests = "${libdir}/${BPN}/test" |
37 | RDEPENDS_${PN}-tests = "python python-pygobject python-dbus" | 41 | RDEPENDS_${PN}-tests = "python3 python3-pygobject python3-dbus" |
diff --git a/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch b/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch deleted file mode 100644 index 5f8ca77101..0000000000 --- a/meta/recipes-connectivity/ofono/ofono/Revert-test-Convert-to-Python-3.patch +++ /dev/null | |||
@@ -1,1270 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | From 572fc23f6efd65a2ef9e6c957b2506108738672b Mon Sep 17 00:00:00 2001 | ||
4 | From: Cristian Iorga <cristian.iorga@intel.com> | ||
5 | Date: Mon, 25 Aug 2014 16:59:39 +0300 | ||
6 | Subject: [PATCH] Revert "test: Convert to Python 3" | ||
7 | |||
8 | This reverts commit c027ab9fbc1a8e8c9e76bcd123df1ad7696307c2. | ||
9 | --- | ||
10 | test/activate-context | 2 +- | ||
11 | test/answer-calls | 2 +- | ||
12 | test/backtrace | 2 +- | ||
13 | test/cancel-ussd | 2 +- | ||
14 | test/cdma-connman-disable | 2 +- | ||
15 | test/cdma-connman-enable | 2 +- | ||
16 | test/cdma-dial-number | 2 +- | ||
17 | test/cdma-hangup | 2 +- | ||
18 | test/cdma-list-call | 2 +- | ||
19 | test/cdma-set-credentials | 2 +- | ||
20 | test/change-pin | 2 +- | ||
21 | test/create-internet-context | 2 +- | ||
22 | test/create-mms-context | 2 +- | ||
23 | test/create-multiparty | 2 +- | ||
24 | test/deactivate-all | 2 +- | ||
25 | test/deactivate-context | 2 +- | ||
26 | test/dial-number | 2 +- | ||
27 | test/disable-call-forwarding | 2 +- | ||
28 | test/disable-gprs | 2 +- | ||
29 | test/disable-modem | 2 +- | ||
30 | test/display-icon | 2 +- | ||
31 | test/enable-cbs | 2 +- | ||
32 | test/enable-gprs | 2 +- | ||
33 | test/enable-modem | 2 +- | ||
34 | test/enter-pin | 2 +- | ||
35 | test/get-icon | 2 +- | ||
36 | test/get-operators | 2 +- | ||
37 | test/get-tech-preference | 2 +- | ||
38 | test/hangup-active | 2 +- | ||
39 | test/hangup-all | 2 +- | ||
40 | test/hangup-call | 2 +- | ||
41 | test/hangup-multiparty | 2 +- | ||
42 | test/hold-and-answer | 2 +- | ||
43 | test/initiate-ussd | 4 ++-- | ||
44 | test/list-calls | 2 +- | ||
45 | test/list-contexts | 2 +- | ||
46 | test/list-messages | 2 +- | ||
47 | test/list-modems | 2 +- | ||
48 | test/list-operators | 2 +- | ||
49 | test/lock-pin | 2 +- | ||
50 | test/lockdown-modem | 2 +- | ||
51 | test/monitor-ofono | 4 ++-- | ||
52 | test/offline-modem | 2 +- | ||
53 | test/online-modem | 2 +- | ||
54 | test/private-chat | 2 +- | ||
55 | test/process-context-settings | 2 +- | ||
56 | test/receive-sms | 2 +- | ||
57 | test/reject-calls | 2 +- | ||
58 | test/release-and-answer | 2 +- | ||
59 | test/release-and-swap | 2 +- | ||
60 | test/remove-contexts | 2 +- | ||
61 | test/reset-pin | 2 +- | ||
62 | test/scan-for-operators | 2 +- | ||
63 | test/send-sms | 2 +- | ||
64 | test/send-ussd | 4 ++-- | ||
65 | test/send-vcal | 2 +- | ||
66 | test/send-vcard | 2 +- | ||
67 | test/set-call-forwarding | 2 +- | ||
68 | test/set-cbs-topics | 2 +- | ||
69 | test/set-context-property | 2 +- | ||
70 | test/set-fast-dormancy | 2 +- | ||
71 | test/set-gsm-band | 2 +- | ||
72 | test/set-mic-volume | 2 +- | ||
73 | test/set-mms-details | 2 +- | ||
74 | test/set-msisdn | 2 +- | ||
75 | test/set-roaming-allowed | 2 +- | ||
76 | test/set-speaker-volume | 2 +- | ||
77 | test/set-tech-preference | 2 +- | ||
78 | test/set-tty | 2 +- | ||
79 | test/set-umts-band | 2 +- | ||
80 | test/set-use-sms-reports | 2 +- | ||
81 | test/swap-calls | 2 +- | ||
82 | test/test-advice-of-charge | 2 +- | ||
83 | test/test-call-barring | 2 +- | ||
84 | test/test-call-forwarding | 2 +- | ||
85 | test/test-call-settings | 2 +- | ||
86 | test/test-cbs | 4 ++-- | ||
87 | test/test-gnss | 4 ++-- | ||
88 | test/test-message-waiting | 2 +- | ||
89 | test/test-modem | 2 +- | ||
90 | test/test-network-registration | 2 +- | ||
91 | test/test-phonebook | 2 +- | ||
92 | test/test-push-notification | 2 +- | ||
93 | test/test-smart-messaging | 2 +- | ||
94 | test/test-sms | 18 +++++++++--------- | ||
95 | test/test-ss | 2 +- | ||
96 | test/test-ss-control-cb | 2 +- | ||
97 | test/test-ss-control-cf | 2 +- | ||
98 | test/test-ss-control-cs | 2 +- | ||
99 | test/test-stk-menu | 34 +++++++++++++++++----------------- | ||
100 | test/unlock-pin | 2 +- | ||
101 | 94 files changed, 124 insertions(+), 124 deletions(-) | ||
102 | |||
103 | diff --git a/test/activate-context b/test/activate-context | ||
104 | index e4fc702..4241396 100755 | ||
105 | --- a/test/activate-context | ||
106 | +++ b/test/activate-context | ||
107 | @@ -1,4 +1,4 @@ | ||
108 | -#!/usr/bin/python3 | ||
109 | +#!/usr/bin/python | ||
110 | |||
111 | import sys | ||
112 | import dbus | ||
113 | diff --git a/test/answer-calls b/test/answer-calls | ||
114 | index daa794b..45ff08f 100755 | ||
115 | --- a/test/answer-calls | ||
116 | +++ b/test/answer-calls | ||
117 | @@ -1,4 +1,4 @@ | ||
118 | -#!/usr/bin/python3 | ||
119 | +#!/usr/bin/python | ||
120 | |||
121 | import dbus | ||
122 | |||
123 | diff --git a/test/backtrace b/test/backtrace | ||
124 | index 03c7632..c624709 100755 | ||
125 | --- a/test/backtrace | ||
126 | +++ b/test/backtrace | ||
127 | @@ -1,4 +1,4 @@ | ||
128 | -#!/usr/bin/python3 | ||
129 | +#!/usr/bin/python | ||
130 | |||
131 | import os | ||
132 | import re | ||
133 | diff --git a/test/cancel-ussd b/test/cancel-ussd | ||
134 | index e7559ba..1797f26 100755 | ||
135 | --- a/test/cancel-ussd | ||
136 | +++ b/test/cancel-ussd | ||
137 | @@ -1,4 +1,4 @@ | ||
138 | -#!/usr/bin/python3 | ||
139 | +#!/usr/bin/python | ||
140 | |||
141 | import sys | ||
142 | import dbus | ||
143 | diff --git a/test/cdma-connman-disable b/test/cdma-connman-disable | ||
144 | index 3adc14d..0ddc0cd 100755 | ||
145 | --- a/test/cdma-connman-disable | ||
146 | +++ b/test/cdma-connman-disable | ||
147 | @@ -1,4 +1,4 @@ | ||
148 | -#!/usr/bin/python3 | ||
149 | +#!/usr/bin/python | ||
150 | |||
151 | import dbus | ||
152 | import sys | ||
153 | diff --git a/test/cdma-connman-enable b/test/cdma-connman-enable | ||
154 | index ac16a2d..a3cca01 100755 | ||
155 | --- a/test/cdma-connman-enable | ||
156 | +++ b/test/cdma-connman-enable | ||
157 | @@ -1,4 +1,4 @@ | ||
158 | -#!/usr/bin/python3 | ||
159 | +#!/usr/bin/python | ||
160 | |||
161 | import dbus | ||
162 | import sys | ||
163 | diff --git a/test/cdma-dial-number b/test/cdma-dial-number | ||
164 | index 683431e..9cdfb24 100755 | ||
165 | --- a/test/cdma-dial-number | ||
166 | +++ b/test/cdma-dial-number | ||
167 | @@ -1,4 +1,4 @@ | ||
168 | -#!/usr/bin/python3 | ||
169 | +#!/usr/bin/python | ||
170 | |||
171 | import sys | ||
172 | import dbus | ||
173 | diff --git a/test/cdma-hangup b/test/cdma-hangup | ||
174 | index 41ffa60..493ece4 100755 | ||
175 | --- a/test/cdma-hangup | ||
176 | +++ b/test/cdma-hangup | ||
177 | @@ -1,4 +1,4 @@ | ||
178 | -#!/usr/bin/python3 | ||
179 | +#!/usr/bin/python | ||
180 | |||
181 | import sys | ||
182 | import dbus | ||
183 | diff --git a/test/cdma-list-call b/test/cdma-list-call | ||
184 | index b132353..5d36a69 100755 | ||
185 | --- a/test/cdma-list-call | ||
186 | +++ b/test/cdma-list-call | ||
187 | @@ -1,4 +1,4 @@ | ||
188 | -#!/usr/bin/python3 | ||
189 | +#!/usr/bin/python | ||
190 | |||
191 | import dbus | ||
192 | |||
193 | diff --git a/test/cdma-set-credentials b/test/cdma-set-credentials | ||
194 | index a60c86e..a286b0e 100755 | ||
195 | --- a/test/cdma-set-credentials | ||
196 | +++ b/test/cdma-set-credentials | ||
197 | @@ -1,4 +1,4 @@ | ||
198 | -#!/usr/bin/python3 | ||
199 | +#!/usr/bin/python | ||
200 | |||
201 | import dbus | ||
202 | import sys | ||
203 | diff --git a/test/change-pin b/test/change-pin | ||
204 | index 301c6ce..000ce53 100755 | ||
205 | --- a/test/change-pin | ||
206 | +++ b/test/change-pin | ||
207 | @@ -1,4 +1,4 @@ | ||
208 | -#!/usr/bin/python3 | ||
209 | +#!/usr/bin/python | ||
210 | |||
211 | import dbus | ||
212 | import sys | ||
213 | diff --git a/test/create-internet-context b/test/create-internet-context | ||
214 | index 1089053..efd0998 100755 | ||
215 | --- a/test/create-internet-context | ||
216 | +++ b/test/create-internet-context | ||
217 | @@ -1,4 +1,4 @@ | ||
218 | -#!/usr/bin/python3 | ||
219 | +#!/usr/bin/python | ||
220 | |||
221 | import sys | ||
222 | import dbus | ||
223 | diff --git a/test/create-mms-context b/test/create-mms-context | ||
224 | index 598336f..e5be08d 100755 | ||
225 | --- a/test/create-mms-context | ||
226 | +++ b/test/create-mms-context | ||
227 | @@ -1,4 +1,4 @@ | ||
228 | -#!/usr/bin/python3 | ||
229 | +#!/usr/bin/python | ||
230 | |||
231 | import sys | ||
232 | import dbus | ||
233 | diff --git a/test/create-multiparty b/test/create-multiparty | ||
234 | index 1b76010..97047c3 100755 | ||
235 | --- a/test/create-multiparty | ||
236 | +++ b/test/create-multiparty | ||
237 | @@ -1,4 +1,4 @@ | ||
238 | -#!/usr/bin/python3 | ||
239 | +#!/usr/bin/python | ||
240 | |||
241 | import sys | ||
242 | import dbus | ||
243 | diff --git a/test/deactivate-all b/test/deactivate-all | ||
244 | index 5aa8587..427009e 100755 | ||
245 | --- a/test/deactivate-all | ||
246 | +++ b/test/deactivate-all | ||
247 | @@ -1,4 +1,4 @@ | ||
248 | -#!/usr/bin/python3 | ||
249 | +#!/usr/bin/python | ||
250 | |||
251 | import sys | ||
252 | import dbus | ||
253 | diff --git a/test/deactivate-context b/test/deactivate-context | ||
254 | index 5c86a71..df47d2e 100755 | ||
255 | --- a/test/deactivate-context | ||
256 | +++ b/test/deactivate-context | ||
257 | @@ -1,4 +1,4 @@ | ||
258 | -#!/usr/bin/python3 | ||
259 | +#!/usr/bin/python | ||
260 | |||
261 | import sys | ||
262 | import dbus | ||
263 | diff --git a/test/dial-number b/test/dial-number | ||
264 | index fe5adad..ee674d9 100755 | ||
265 | --- a/test/dial-number | ||
266 | +++ b/test/dial-number | ||
267 | @@ -1,4 +1,4 @@ | ||
268 | -#!/usr/bin/python3 | ||
269 | +#!/usr/bin/python | ||
270 | |||
271 | import sys | ||
272 | import dbus | ||
273 | diff --git a/test/disable-call-forwarding b/test/disable-call-forwarding | ||
274 | index 811e4fa..3609816 100755 | ||
275 | --- a/test/disable-call-forwarding | ||
276 | +++ b/test/disable-call-forwarding | ||
277 | @@ -1,4 +1,4 @@ | ||
278 | -#!/usr/bin/python3 | ||
279 | +#!/usr/bin/python | ||
280 | |||
281 | import sys | ||
282 | from gi.repository import GLib | ||
283 | diff --git a/test/disable-gprs b/test/disable-gprs | ||
284 | index 61ce216..c6c40a5 100755 | ||
285 | --- a/test/disable-gprs | ||
286 | +++ b/test/disable-gprs | ||
287 | @@ -1,4 +1,4 @@ | ||
288 | -#!/usr/bin/python3 | ||
289 | +#!/usr/bin/python | ||
290 | |||
291 | import dbus | ||
292 | import sys | ||
293 | diff --git a/test/disable-modem b/test/disable-modem | ||
294 | index 6fba857..ca8c8d8 100755 | ||
295 | --- a/test/disable-modem | ||
296 | +++ b/test/disable-modem | ||
297 | @@ -1,4 +1,4 @@ | ||
298 | -#!/usr/bin/python3 | ||
299 | +#!/usr/bin/python | ||
300 | |||
301 | import dbus | ||
302 | import sys | ||
303 | diff --git a/test/display-icon b/test/display-icon | ||
304 | index ac40818..753d14d 100755 | ||
305 | --- a/test/display-icon | ||
306 | +++ b/test/display-icon | ||
307 | @@ -1,4 +1,4 @@ | ||
308 | -#!/usr/bin/python3 | ||
309 | +#!/usr/bin/python | ||
310 | |||
311 | import sys | ||
312 | import dbus | ||
313 | diff --git a/test/enable-cbs b/test/enable-cbs | ||
314 | index 4a8bf66..c08bf2b 100755 | ||
315 | --- a/test/enable-cbs | ||
316 | +++ b/test/enable-cbs | ||
317 | @@ -1,4 +1,4 @@ | ||
318 | -#!/usr/bin/python3 | ||
319 | +#!/usr/bin/python | ||
320 | |||
321 | import dbus | ||
322 | import sys | ||
323 | diff --git a/test/enable-gprs b/test/enable-gprs | ||
324 | index 68d5ef0..8664891 100755 | ||
325 | --- a/test/enable-gprs | ||
326 | +++ b/test/enable-gprs | ||
327 | @@ -1,4 +1,4 @@ | ||
328 | -#!/usr/bin/python3 | ||
329 | +#!/usr/bin/python | ||
330 | |||
331 | import dbus | ||
332 | import sys | ||
333 | diff --git a/test/enable-modem b/test/enable-modem | ||
334 | index fc5958a..dfaaaa8 100755 | ||
335 | --- a/test/enable-modem | ||
336 | +++ b/test/enable-modem | ||
337 | @@ -1,4 +1,4 @@ | ||
338 | -#!/usr/bin/python3 | ||
339 | +#!/usr/bin/python | ||
340 | |||
341 | import dbus | ||
342 | import sys | ||
343 | diff --git a/test/enter-pin b/test/enter-pin | ||
344 | index 9556363..c6ee669 100755 | ||
345 | --- a/test/enter-pin | ||
346 | +++ b/test/enter-pin | ||
347 | @@ -1,4 +1,4 @@ | ||
348 | -#!/usr/bin/python3 | ||
349 | +#!/usr/bin/python | ||
350 | |||
351 | import dbus | ||
352 | import sys | ||
353 | diff --git a/test/get-icon b/test/get-icon | ||
354 | index 5569a33..fdaaee7 100755 | ||
355 | --- a/test/get-icon | ||
356 | +++ b/test/get-icon | ||
357 | @@ -1,4 +1,4 @@ | ||
358 | -#!/usr/bin/python3 | ||
359 | +#!/usr/bin/python | ||
360 | |||
361 | import dbus | ||
362 | import sys | ||
363 | diff --git a/test/get-operators b/test/get-operators | ||
364 | index 0f35c80..62354c5 100755 | ||
365 | --- a/test/get-operators | ||
366 | +++ b/test/get-operators | ||
367 | @@ -1,4 +1,4 @@ | ||
368 | -#!/usr/bin/python3 | ||
369 | +#!/usr/bin/python | ||
370 | |||
371 | import dbus | ||
372 | import sys | ||
373 | diff --git a/test/get-tech-preference b/test/get-tech-preference | ||
374 | index 7ba6365..77d20d0 100755 | ||
375 | --- a/test/get-tech-preference | ||
376 | +++ b/test/get-tech-preference | ||
377 | @@ -1,4 +1,4 @@ | ||
378 | -#!/usr/bin/python3 | ||
379 | +#!/usr/bin/python | ||
380 | |||
381 | import dbus, sys | ||
382 | |||
383 | diff --git a/test/hangup-active b/test/hangup-active | ||
384 | index 82e0eb0..5af62ab 100755 | ||
385 | --- a/test/hangup-active | ||
386 | +++ b/test/hangup-active | ||
387 | @@ -1,4 +1,4 @@ | ||
388 | -#!/usr/bin/python3 | ||
389 | +#!/usr/bin/python | ||
390 | |||
391 | import sys | ||
392 | import dbus | ||
393 | diff --git a/test/hangup-all b/test/hangup-all | ||
394 | index 3a0138d..32933db 100755 | ||
395 | --- a/test/hangup-all | ||
396 | +++ b/test/hangup-all | ||
397 | @@ -1,4 +1,4 @@ | ||
398 | -#!/usr/bin/python3 | ||
399 | +#!/usr/bin/python | ||
400 | |||
401 | import sys | ||
402 | import dbus | ||
403 | diff --git a/test/hangup-call b/test/hangup-call | ||
404 | index 5a2de20..447020c 100755 | ||
405 | --- a/test/hangup-call | ||
406 | +++ b/test/hangup-call | ||
407 | @@ -1,4 +1,4 @@ | ||
408 | -#!/usr/bin/python3 | ||
409 | +#!/usr/bin/python | ||
410 | |||
411 | import sys | ||
412 | import dbus | ||
413 | diff --git a/test/hangup-multiparty b/test/hangup-multiparty | ||
414 | index 24751c3..48fe342 100755 | ||
415 | --- a/test/hangup-multiparty | ||
416 | +++ b/test/hangup-multiparty | ||
417 | @@ -1,4 +1,4 @@ | ||
418 | -#!/usr/bin/python3 | ||
419 | +#!/usr/bin/python | ||
420 | |||
421 | import sys | ||
422 | import dbus | ||
423 | diff --git a/test/hold-and-answer b/test/hold-and-answer | ||
424 | index da3be57..2c47e27 100755 | ||
425 | --- a/test/hold-and-answer | ||
426 | +++ b/test/hold-and-answer | ||
427 | @@ -1,4 +1,4 @@ | ||
428 | -#!/usr/bin/python3 | ||
429 | +#!/usr/bin/python | ||
430 | |||
431 | import sys | ||
432 | import dbus | ||
433 | diff --git a/test/initiate-ussd b/test/initiate-ussd | ||
434 | index faf50d0..d7022f1 100755 | ||
435 | --- a/test/initiate-ussd | ||
436 | +++ b/test/initiate-ussd | ||
437 | @@ -1,4 +1,4 @@ | ||
438 | -#!/usr/bin/python3 | ||
439 | +#!/usr/bin/python | ||
440 | |||
441 | import sys | ||
442 | import dbus | ||
443 | @@ -45,7 +45,7 @@ if state == "idle": | ||
444 | print("State: %s" % (state)) | ||
445 | |||
446 | while state == "user-response": | ||
447 | - response = input("Enter response: ") | ||
448 | + response = raw_input("Enter response: ") | ||
449 | |||
450 | result = ussd.Respond(response, timeout=100) | ||
451 | |||
452 | diff --git a/test/list-calls b/test/list-calls | ||
453 | index f3ee991..08668c6 100755 | ||
454 | --- a/test/list-calls | ||
455 | +++ b/test/list-calls | ||
456 | @@ -1,4 +1,4 @@ | ||
457 | -#!/usr/bin/python3 | ||
458 | +#!/usr/bin/python | ||
459 | |||
460 | import dbus | ||
461 | |||
462 | diff --git a/test/list-contexts b/test/list-contexts | ||
463 | index 78278ca..f0d4094 100755 | ||
464 | --- a/test/list-contexts | ||
465 | +++ b/test/list-contexts | ||
466 | @@ -1,4 +1,4 @@ | ||
467 | -#!/usr/bin/python3 | ||
468 | +#!/usr/bin/python | ||
469 | |||
470 | import dbus | ||
471 | |||
472 | diff --git a/test/list-messages b/test/list-messages | ||
473 | index 9f5bce3..cfccbea 100755 | ||
474 | --- a/test/list-messages | ||
475 | +++ b/test/list-messages | ||
476 | @@ -1,4 +1,4 @@ | ||
477 | -#!/usr/bin/python3 | ||
478 | +#!/usr/bin/python | ||
479 | |||
480 | import dbus | ||
481 | |||
482 | diff --git a/test/list-modems b/test/list-modems | ||
483 | index b9f510a..ed66124 100755 | ||
484 | --- a/test/list-modems | ||
485 | +++ b/test/list-modems | ||
486 | @@ -1,4 +1,4 @@ | ||
487 | -#!/usr/bin/python3 | ||
488 | +#!/usr/bin/python | ||
489 | |||
490 | import dbus | ||
491 | |||
492 | diff --git a/test/list-operators b/test/list-operators | ||
493 | index 064c4e3..349bf41 100755 | ||
494 | --- a/test/list-operators | ||
495 | +++ b/test/list-operators | ||
496 | @@ -1,4 +1,4 @@ | ||
497 | -#!/usr/bin/python3 | ||
498 | +#!/usr/bin/python | ||
499 | |||
500 | import dbus | ||
501 | import sys | ||
502 | diff --git a/test/lock-pin b/test/lock-pin | ||
503 | index 96ea9c2..5579735 100755 | ||
504 | --- a/test/lock-pin | ||
505 | +++ b/test/lock-pin | ||
506 | @@ -1,4 +1,4 @@ | ||
507 | -#!/usr/bin/python3 | ||
508 | +#!/usr/bin/python | ||
509 | |||
510 | import dbus | ||
511 | import sys | ||
512 | diff --git a/test/lockdown-modem b/test/lockdown-modem | ||
513 | index 4e04205..781abb6 100755 | ||
514 | --- a/test/lockdown-modem | ||
515 | +++ b/test/lockdown-modem | ||
516 | @@ -1,4 +1,4 @@ | ||
517 | -#!/usr/bin/python3 | ||
518 | +#!/usr/bin/python | ||
519 | |||
520 | import dbus | ||
521 | import sys | ||
522 | diff --git a/test/monitor-ofono b/test/monitor-ofono | ||
523 | index 8830757..bd31617 100755 | ||
524 | --- a/test/monitor-ofono | ||
525 | +++ b/test/monitor-ofono | ||
526 | @@ -1,4 +1,4 @@ | ||
527 | -#!/usr/bin/python3 | ||
528 | +#!/usr/bin/python | ||
529 | |||
530 | from gi.repository import GLib | ||
531 | |||
532 | @@ -6,7 +6,7 @@ import dbus | ||
533 | import dbus.mainloop.glib | ||
534 | |||
535 | _dbus2py = { | ||
536 | - dbus.String : str, | ||
537 | + dbus.String : unicode, | ||
538 | dbus.UInt32 : int, | ||
539 | dbus.Int32 : int, | ||
540 | dbus.Int16 : int, | ||
541 | diff --git a/test/offline-modem b/test/offline-modem | ||
542 | index e8c043a..ea1f522 100755 | ||
543 | --- a/test/offline-modem | ||
544 | +++ b/test/offline-modem | ||
545 | @@ -1,4 +1,4 @@ | ||
546 | -#!/usr/bin/python3 | ||
547 | +#!/usr/bin/python | ||
548 | |||
549 | import dbus, sys | ||
550 | |||
551 | diff --git a/test/online-modem b/test/online-modem | ||
552 | index 029c4a5..310ed7d 100755 | ||
553 | --- a/test/online-modem | ||
554 | +++ b/test/online-modem | ||
555 | @@ -1,4 +1,4 @@ | ||
556 | -#!/usr/bin/python3 | ||
557 | +#!/usr/bin/python | ||
558 | |||
559 | import dbus, sys | ||
560 | |||
561 | diff --git a/test/private-chat b/test/private-chat | ||
562 | index e7e5406..ef2ef6c 100755 | ||
563 | --- a/test/private-chat | ||
564 | +++ b/test/private-chat | ||
565 | @@ -1,4 +1,4 @@ | ||
566 | -#!/usr/bin/python3 | ||
567 | +#!/usr/bin/python | ||
568 | |||
569 | import sys | ||
570 | import dbus | ||
571 | diff --git a/test/process-context-settings b/test/process-context-settings | ||
572 | index 8a3ecfa..0f058b2 100755 | ||
573 | --- a/test/process-context-settings | ||
574 | +++ b/test/process-context-settings | ||
575 | @@ -1,4 +1,4 @@ | ||
576 | -#!/usr/bin/python3 | ||
577 | +#!/usr/bin/python | ||
578 | |||
579 | import os | ||
580 | import dbus | ||
581 | diff --git a/test/receive-sms b/test/receive-sms | ||
582 | index a0c6915..c23eb14 100755 | ||
583 | --- a/test/receive-sms | ||
584 | +++ b/test/receive-sms | ||
585 | @@ -1,4 +1,4 @@ | ||
586 | -#!/usr/bin/python3 | ||
587 | +#!/usr/bin/python | ||
588 | |||
589 | from gi.repository import GLib | ||
590 | |||
591 | diff --git a/test/reject-calls b/test/reject-calls | ||
592 | index 71b243e..9edf1ff 100755 | ||
593 | --- a/test/reject-calls | ||
594 | +++ b/test/reject-calls | ||
595 | @@ -1,4 +1,4 @@ | ||
596 | -#!/usr/bin/python3 | ||
597 | +#!/usr/bin/python | ||
598 | |||
599 | import dbus | ||
600 | |||
601 | diff --git a/test/release-and-answer b/test/release-and-answer | ||
602 | index dec8e17..25fd818 100755 | ||
603 | --- a/test/release-and-answer | ||
604 | +++ b/test/release-and-answer | ||
605 | @@ -1,4 +1,4 @@ | ||
606 | -#!/usr/bin/python3 | ||
607 | +#!/usr/bin/python | ||
608 | |||
609 | import sys | ||
610 | import dbus | ||
611 | diff --git a/test/release-and-swap b/test/release-and-swap | ||
612 | index cb8c84e..7b3569f 100755 | ||
613 | --- a/test/release-and-swap | ||
614 | +++ b/test/release-and-swap | ||
615 | @@ -1,4 +1,4 @@ | ||
616 | -#!/usr/bin/python3 | ||
617 | +#!/usr/bin/python | ||
618 | |||
619 | import sys | ||
620 | import dbus | ||
621 | diff --git a/test/remove-contexts b/test/remove-contexts | ||
622 | index b54184e..c5082cb 100755 | ||
623 | --- a/test/remove-contexts | ||
624 | +++ b/test/remove-contexts | ||
625 | @@ -1,4 +1,4 @@ | ||
626 | -#!/usr/bin/python3 | ||
627 | +#!/usr/bin/python | ||
628 | |||
629 | import dbus | ||
630 | |||
631 | diff --git a/test/reset-pin b/test/reset-pin | ||
632 | index 3fbd126..b429254 100755 | ||
633 | --- a/test/reset-pin | ||
634 | +++ b/test/reset-pin | ||
635 | @@ -1,4 +1,4 @@ | ||
636 | -#!/usr/bin/python3 | ||
637 | +#!/usr/bin/python | ||
638 | |||
639 | import dbus | ||
640 | import sys | ||
641 | diff --git a/test/scan-for-operators b/test/scan-for-operators | ||
642 | index b4fc05e..749c710 100755 | ||
643 | --- a/test/scan-for-operators | ||
644 | +++ b/test/scan-for-operators | ||
645 | @@ -1,4 +1,4 @@ | ||
646 | -#!/usr/bin/python3 | ||
647 | +#!/usr/bin/python | ||
648 | |||
649 | import dbus | ||
650 | import sys | ||
651 | diff --git a/test/send-sms b/test/send-sms | ||
652 | index 98808aa..e06444d 100755 | ||
653 | --- a/test/send-sms | ||
654 | +++ b/test/send-sms | ||
655 | @@ -1,4 +1,4 @@ | ||
656 | -#!/usr/bin/python3 | ||
657 | +#!/usr/bin/python | ||
658 | |||
659 | import sys | ||
660 | import dbus | ||
661 | diff --git a/test/send-ussd b/test/send-ussd | ||
662 | index a20e098..e585883 100755 | ||
663 | --- a/test/send-ussd | ||
664 | +++ b/test/send-ussd | ||
665 | @@ -1,4 +1,4 @@ | ||
666 | -#!/usr/bin/python3 | ||
667 | +#!/usr/bin/python | ||
668 | |||
669 | import sys | ||
670 | import dbus | ||
671 | @@ -46,7 +46,7 @@ if state == "idle": | ||
672 | print("State: %s" % (state)) | ||
673 | |||
674 | while state == "user-response": | ||
675 | - response = input("Enter response: ") | ||
676 | + response = raw_input("Enter response: ") | ||
677 | |||
678 | print(ussd.Respond(response, timeout=100)) | ||
679 | |||
680 | diff --git a/test/send-vcal b/test/send-vcal | ||
681 | index 566daef..7f8272b 100755 | ||
682 | --- a/test/send-vcal | ||
683 | +++ b/test/send-vcal | ||
684 | @@ -1,4 +1,4 @@ | ||
685 | -#!/usr/bin/python3 | ||
686 | +#!/usr/bin/python | ||
687 | |||
688 | import sys | ||
689 | import dbus | ||
690 | diff --git a/test/send-vcard b/test/send-vcard | ||
691 | index 4dedf51..250b36f 100755 | ||
692 | --- a/test/send-vcard | ||
693 | +++ b/test/send-vcard | ||
694 | @@ -1,4 +1,4 @@ | ||
695 | -#!/usr/bin/python3 | ||
696 | +#!/usr/bin/python | ||
697 | |||
698 | import sys | ||
699 | import dbus | ||
700 | diff --git a/test/set-call-forwarding b/test/set-call-forwarding | ||
701 | index 49d1ce0..9fd358b 100755 | ||
702 | --- a/test/set-call-forwarding | ||
703 | +++ b/test/set-call-forwarding | ||
704 | @@ -1,4 +1,4 @@ | ||
705 | -#!/usr/bin/python3 | ||
706 | +#!/usr/bin/python | ||
707 | |||
708 | import sys | ||
709 | from gi.repository import GLib | ||
710 | diff --git a/test/set-cbs-topics b/test/set-cbs-topics | ||
711 | index db95e16..78d6d44 100755 | ||
712 | --- a/test/set-cbs-topics | ||
713 | +++ b/test/set-cbs-topics | ||
714 | @@ -1,4 +1,4 @@ | ||
715 | -#!/usr/bin/python3 | ||
716 | +#!/usr/bin/python | ||
717 | |||
718 | import dbus | ||
719 | import sys | ||
720 | diff --git a/test/set-context-property b/test/set-context-property | ||
721 | index 5ff7a67..64a6fb8 100755 | ||
722 | --- a/test/set-context-property | ||
723 | +++ b/test/set-context-property | ||
724 | @@ -1,4 +1,4 @@ | ||
725 | -#!/usr/bin/python3 | ||
726 | +#!/usr/bin/python | ||
727 | |||
728 | import sys | ||
729 | import dbus | ||
730 | diff --git a/test/set-fast-dormancy b/test/set-fast-dormancy | ||
731 | index ef77bcd..7bf7715 100755 | ||
732 | --- a/test/set-fast-dormancy | ||
733 | +++ b/test/set-fast-dormancy | ||
734 | @@ -1,4 +1,4 @@ | ||
735 | -#!/usr/bin/python3 | ||
736 | +#!/usr/bin/python | ||
737 | |||
738 | import dbus | ||
739 | import sys | ||
740 | diff --git a/test/set-gsm-band b/test/set-gsm-band | ||
741 | index b37bcb5..3c17c10 100755 | ||
742 | --- a/test/set-gsm-band | ||
743 | +++ b/test/set-gsm-band | ||
744 | @@ -1,4 +1,4 @@ | ||
745 | -#!/usr/bin/python3 | ||
746 | +#!/usr/bin/python | ||
747 | |||
748 | import dbus | ||
749 | import sys | ||
750 | diff --git a/test/set-mic-volume b/test/set-mic-volume | ||
751 | index cd6c73f..e0bff49 100755 | ||
752 | --- a/test/set-mic-volume | ||
753 | +++ b/test/set-mic-volume | ||
754 | @@ -1,4 +1,4 @@ | ||
755 | -#!/usr/bin/python3 | ||
756 | +#!/usr/bin/python | ||
757 | |||
758 | import sys | ||
759 | import dbus | ||
760 | diff --git a/test/set-mms-details b/test/set-mms-details | ||
761 | index 6ee59fa..d2d0838 100755 | ||
762 | --- a/test/set-mms-details | ||
763 | +++ b/test/set-mms-details | ||
764 | @@ -1,4 +1,4 @@ | ||
765 | -#!/usr/bin/python3 | ||
766 | +#!/usr/bin/python | ||
767 | |||
768 | import sys | ||
769 | import dbus | ||
770 | diff --git a/test/set-msisdn b/test/set-msisdn | ||
771 | index b5fe819..01f284d 100755 | ||
772 | --- a/test/set-msisdn | ||
773 | +++ b/test/set-msisdn | ||
774 | @@ -1,4 +1,4 @@ | ||
775 | -#!/usr/bin/python3 | ||
776 | +#!/usr/bin/python | ||
777 | |||
778 | import dbus | ||
779 | import sys | ||
780 | diff --git a/test/set-roaming-allowed b/test/set-roaming-allowed | ||
781 | index 698c8b6..9e3e058 100755 | ||
782 | --- a/test/set-roaming-allowed | ||
783 | +++ b/test/set-roaming-allowed | ||
784 | @@ -1,4 +1,4 @@ | ||
785 | -#!/usr/bin/python3 | ||
786 | +#!/usr/bin/python | ||
787 | |||
788 | import sys | ||
789 | import dbus | ||
790 | diff --git a/test/set-speaker-volume b/test/set-speaker-volume | ||
791 | index 6d4e301..7962f39 100755 | ||
792 | --- a/test/set-speaker-volume | ||
793 | +++ b/test/set-speaker-volume | ||
794 | @@ -1,4 +1,4 @@ | ||
795 | -#!/usr/bin/python3 | ||
796 | +#!/usr/bin/python | ||
797 | |||
798 | import sys | ||
799 | import dbus | ||
800 | diff --git a/test/set-tech-preference b/test/set-tech-preference | ||
801 | index b549abc..2666cbd 100755 | ||
802 | --- a/test/set-tech-preference | ||
803 | +++ b/test/set-tech-preference | ||
804 | @@ -1,4 +1,4 @@ | ||
805 | -#!/usr/bin/python3 | ||
806 | +#!/usr/bin/python | ||
807 | |||
808 | import dbus | ||
809 | import sys | ||
810 | diff --git a/test/set-tty b/test/set-tty | ||
811 | index eed1fba..53d6b99 100755 | ||
812 | --- a/test/set-tty | ||
813 | +++ b/test/set-tty | ||
814 | @@ -1,4 +1,4 @@ | ||
815 | -#!/usr/bin/python3 | ||
816 | +#!/usr/bin/python | ||
817 | |||
818 | import dbus | ||
819 | import sys | ||
820 | diff --git a/test/set-umts-band b/test/set-umts-band | ||
821 | index 0bae5c4..c1e6448 100755 | ||
822 | --- a/test/set-umts-band | ||
823 | +++ b/test/set-umts-band | ||
824 | @@ -1,4 +1,4 @@ | ||
825 | -#!/usr/bin/python3 | ||
826 | +#!/usr/bin/python | ||
827 | |||
828 | import dbus | ||
829 | import sys | ||
830 | diff --git a/test/set-use-sms-reports b/test/set-use-sms-reports | ||
831 | index 288d4e1..a4efe4f 100755 | ||
832 | --- a/test/set-use-sms-reports | ||
833 | +++ b/test/set-use-sms-reports | ||
834 | @@ -1,4 +1,4 @@ | ||
835 | -#!/usr/bin/python3 | ||
836 | +#!/usr/bin/python | ||
837 | |||
838 | import dbus | ||
839 | import sys | ||
840 | diff --git a/test/swap-calls b/test/swap-calls | ||
841 | index 018a8d3..eeb257b 100755 | ||
842 | --- a/test/swap-calls | ||
843 | +++ b/test/swap-calls | ||
844 | @@ -1,4 +1,4 @@ | ||
845 | -#!/usr/bin/python3 | ||
846 | +#!/usr/bin/python | ||
847 | |||
848 | import sys | ||
849 | import dbus | ||
850 | diff --git a/test/test-advice-of-charge b/test/test-advice-of-charge | ||
851 | index 6e87e61..0f1f57f 100755 | ||
852 | --- a/test/test-advice-of-charge | ||
853 | +++ b/test/test-advice-of-charge | ||
854 | @@ -1,4 +1,4 @@ | ||
855 | -#!/usr/bin/python3 | ||
856 | +#!/usr/bin/python | ||
857 | |||
858 | from gi.repository import GLib | ||
859 | import sys | ||
860 | diff --git a/test/test-call-barring b/test/test-call-barring | ||
861 | index eedb69f..be4ab57 100755 | ||
862 | --- a/test/test-call-barring | ||
863 | +++ b/test/test-call-barring | ||
864 | @@ -1,4 +1,4 @@ | ||
865 | -#!/usr/bin/python3 | ||
866 | +#!/usr/bin/python | ||
867 | |||
868 | from gi.repository import GLib | ||
869 | import sys | ||
870 | diff --git a/test/test-call-forwarding b/test/test-call-forwarding | ||
871 | index 5db84d7..01a7294 100755 | ||
872 | --- a/test/test-call-forwarding | ||
873 | +++ b/test/test-call-forwarding | ||
874 | @@ -1,4 +1,4 @@ | ||
875 | -#!/usr/bin/python3 | ||
876 | +#!/usr/bin/python | ||
877 | |||
878 | from gi.repository import GLib | ||
879 | |||
880 | diff --git a/test/test-call-settings b/test/test-call-settings | ||
881 | index 435594c..5d7ee49 100755 | ||
882 | --- a/test/test-call-settings | ||
883 | +++ b/test/test-call-settings | ||
884 | @@ -1,4 +1,4 @@ | ||
885 | -#!/usr/bin/python3 | ||
886 | +#!/usr/bin/python | ||
887 | |||
888 | from gi.repository import GLib | ||
889 | |||
890 | diff --git a/test/test-cbs b/test/test-cbs | ||
891 | index a5cec06..13cdd80 100755 | ||
892 | --- a/test/test-cbs | ||
893 | +++ b/test/test-cbs | ||
894 | @@ -1,4 +1,4 @@ | ||
895 | -#!/usr/bin/python3 | ||
896 | +#!/usr/bin/python | ||
897 | |||
898 | import dbus | ||
899 | import dbus.mainloop.glib | ||
900 | @@ -78,7 +78,7 @@ def set_topics(cbs): | ||
901 | invalidData = False; | ||
902 | index = 0 | ||
903 | |||
904 | - topics = input('Enter the topic ID(s) you want to register to: ') | ||
905 | + topics = raw_input('Enter the topic ID(s) you want to register to: ') | ||
906 | |||
907 | while index < len(topics): | ||
908 | if topics[index] == ',' or topics[index] == '-': | ||
909 | diff --git a/test/test-gnss b/test/test-gnss | ||
910 | index 6ae64db..aa0b160 100755 | ||
911 | --- a/test/test-gnss | ||
912 | +++ b/test/test-gnss | ||
913 | @@ -1,4 +1,4 @@ | ||
914 | -#!/usr/bin/python3 | ||
915 | +#!/usr/bin/python | ||
916 | |||
917 | from gi.repository import GLib | ||
918 | import sys | ||
919 | @@ -40,7 +40,7 @@ def print_menu(): | ||
920 | def stdin_handler(channel, condition, gnss, path): | ||
921 | in_key = os.read(channel.unix_get_fd(), 160).rstrip().decode('UTF-8') | ||
922 | if in_key == '0': | ||
923 | - xml = input('type the element and press enter: ') | ||
924 | + xml = raw_input('type the element and press enter: ') | ||
925 | try: | ||
926 | gnss.SendPositioningElement(dbus.String(xml)) | ||
927 | print("ok") | ||
928 | diff --git a/test/test-message-waiting b/test/test-message-waiting | ||
929 | index 432862e..b93fbf3 100755 | ||
930 | --- a/test/test-message-waiting | ||
931 | +++ b/test/test-message-waiting | ||
932 | @@ -1,4 +1,4 @@ | ||
933 | -#!/usr/bin/python3 | ||
934 | +#!/usr/bin/python | ||
935 | |||
936 | from gi.repository import GLib | ||
937 | import sys | ||
938 | diff --git a/test/test-modem b/test/test-modem | ||
939 | index aa38b1f..29dbf14 100755 | ||
940 | --- a/test/test-modem | ||
941 | +++ b/test/test-modem | ||
942 | @@ -1,4 +1,4 @@ | ||
943 | -#!/usr/bin/python3 | ||
944 | +#!/usr/bin/python | ||
945 | |||
946 | from gi.repository import GLib | ||
947 | |||
948 | diff --git a/test/test-network-registration b/test/test-network-registration | ||
949 | index 68b4347..c5ad586 100755 | ||
950 | --- a/test/test-network-registration | ||
951 | +++ b/test/test-network-registration | ||
952 | @@ -1,4 +1,4 @@ | ||
953 | -#!/usr/bin/python3 | ||
954 | +#!/usr/bin/python | ||
955 | |||
956 | from gi.repository import GLib | ||
957 | import sys | ||
958 | diff --git a/test/test-phonebook b/test/test-phonebook | ||
959 | index 42646d3..116fd4f 100755 | ||
960 | --- a/test/test-phonebook | ||
961 | +++ b/test/test-phonebook | ||
962 | @@ -1,4 +1,4 @@ | ||
963 | -#!/usr/bin/python3 | ||
964 | +#!/usr/bin/python | ||
965 | |||
966 | import dbus, sys | ||
967 | |||
968 | diff --git a/test/test-push-notification b/test/test-push-notification | ||
969 | index d972ad3..ecc6afb 100755 | ||
970 | --- a/test/test-push-notification | ||
971 | +++ b/test/test-push-notification | ||
972 | @@ -1,4 +1,4 @@ | ||
973 | -#!/usr/bin/python3 | ||
974 | +#!/usr/bin/python | ||
975 | |||
976 | from gi.repository import GLib | ||
977 | |||
978 | diff --git a/test/test-smart-messaging b/test/test-smart-messaging | ||
979 | index f22efd2..188ac1e 100755 | ||
980 | --- a/test/test-smart-messaging | ||
981 | +++ b/test/test-smart-messaging | ||
982 | @@ -1,4 +1,4 @@ | ||
983 | -#!/usr/bin/python3 | ||
984 | +#!/usr/bin/python | ||
985 | |||
986 | from gi.repository import GLib | ||
987 | |||
988 | diff --git a/test/test-sms b/test/test-sms | ||
989 | index 30ac651..49935e1 100755 | ||
990 | --- a/test/test-sms | ||
991 | +++ b/test/test-sms | ||
992 | @@ -1,4 +1,4 @@ | ||
993 | -#!/usr/bin/python3 | ||
994 | +#!/usr/bin/python | ||
995 | # -*- coding: utf-8 -*- | ||
996 | |||
997 | from gi.repository import GLib | ||
998 | @@ -132,7 +132,7 @@ def stdin_handler(channel, condition, sms, value, number): | ||
999 | lock = "on" | ||
1000 | if in_key == '0': | ||
1001 | print_send_sms_menu() | ||
1002 | - sms_type = input('Select SMS type: ') | ||
1003 | + sms_type = raw_input('Select SMS type: ') | ||
1004 | |||
1005 | if sms_type == '1': | ||
1006 | message_send(sms, number, value) | ||
1007 | @@ -150,49 +150,49 @@ def stdin_handler(channel, condition, sms, value, number): | ||
1008 | |||
1009 | elif in_key == '1': | ||
1010 | message_delivery_report(sms, 1) | ||
1011 | - send_msg = input('Send test message[y/n]?: ') | ||
1012 | + send_msg = raw_input('Send test message[y/n]?: ') | ||
1013 | if send_msg == 'y': | ||
1014 | message_send(sms, number, ("(1)" + value + | ||
1015 | ": UseDeliveryReports[TRUE]")) | ||
1016 | |||
1017 | elif in_key == '2': | ||
1018 | message_delivery_report(sms, 0) | ||
1019 | - send_msg = input('Send test message[y/n]?: ') | ||
1020 | + send_msg = raw_input('Send test message[y/n]?: ') | ||
1021 | if send_msg == 'y': | ||
1022 | message_send(sms, number, ("(2) " + value + | ||
1023 | ": UseDeliveryReports[FALSE]")) | ||
1024 | |||
1025 | elif in_key == '3': | ||
1026 | message_service_center_address(sms, SCA) | ||
1027 | - send_msg = input('Send test message[y/n]?: ') | ||
1028 | + send_msg = raw_input('Send test message[y/n]?: ') | ||
1029 | if send_msg == 'y': | ||
1030 | message_send(sms, number, ("(3) " + value + | ||
1031 | ": ServiceCenterAddress")) | ||
1032 | |||
1033 | elif in_key == '4': | ||
1034 | message_bearer(sms, "ps-only") | ||
1035 | - send_msg = input('Send test message[y/n]?: ') | ||
1036 | + send_msg = raw_input('Send test message[y/n]?: ') | ||
1037 | if send_msg == 'y': | ||
1038 | message_send(sms, number, ("(4) " + value + | ||
1039 | ": Bearer[ps-only]")) | ||
1040 | |||
1041 | elif in_key == '5': | ||
1042 | message_bearer(sms, "cs-only") | ||
1043 | - send_msg = input('Send test message[y/n]?: ') | ||
1044 | + send_msg = raw_input('Send test message[y/n]?: ') | ||
1045 | if send_msg == 'y': | ||
1046 | message_send(sms, number, ("(5) " + value + | ||
1047 | ": Bearer[cs-only]")) | ||
1048 | |||
1049 | elif in_key == '6': | ||
1050 | message_bearer(sms, "ps-preferred") | ||
1051 | - send_msg = input('Send test message[y/n]?: ') | ||
1052 | + send_msg = raw_input('Send test message[y/n]?: ') | ||
1053 | if send_msg == 'y': | ||
1054 | message_send(sms, number, ("(6) " + value + | ||
1055 | ": Bearer[ps-preferred]")) | ||
1056 | |||
1057 | elif in_key == '7': | ||
1058 | message_bearer(sms, "cs-preferred") | ||
1059 | - send_msg = input('Send test message[y/n]?: ') | ||
1060 | + send_msg = raw_input('Send test message[y/n]?: ') | ||
1061 | if send_msg == 'y': | ||
1062 | message_send(sms,number, ("(7) " + value + | ||
1063 | ": Bearer[cs-preferred]")) | ||
1064 | diff --git a/test/test-ss b/test/test-ss | ||
1065 | index 4cd8732..2c80806 100755 | ||
1066 | --- a/test/test-ss | ||
1067 | +++ b/test/test-ss | ||
1068 | @@ -1,4 +1,4 @@ | ||
1069 | -#!/usr/bin/python3 | ||
1070 | +#!/usr/bin/python | ||
1071 | |||
1072 | import sys | ||
1073 | import dbus | ||
1074 | diff --git a/test/test-ss-control-cb b/test/test-ss-control-cb | ||
1075 | index ddae6d3..86bac9b 100755 | ||
1076 | --- a/test/test-ss-control-cb | ||
1077 | +++ b/test/test-ss-control-cb | ||
1078 | @@ -1,4 +1,4 @@ | ||
1079 | -#!/usr/bin/python3 | ||
1080 | +#!/usr/bin/python | ||
1081 | |||
1082 | from gi.repository import GLib | ||
1083 | |||
1084 | diff --git a/test/test-ss-control-cf b/test/test-ss-control-cf | ||
1085 | index 095eb5d..d30bf4f 100755 | ||
1086 | --- a/test/test-ss-control-cf | ||
1087 | +++ b/test/test-ss-control-cf | ||
1088 | @@ -1,4 +1,4 @@ | ||
1089 | -#!/usr/bin/python3 | ||
1090 | +#!/usr/bin/python | ||
1091 | |||
1092 | from gi.repository import GLib | ||
1093 | |||
1094 | diff --git a/test/test-ss-control-cs b/test/test-ss-control-cs | ||
1095 | index 8180474..e0ed1d1 100755 | ||
1096 | --- a/test/test-ss-control-cs | ||
1097 | +++ b/test/test-ss-control-cs | ||
1098 | @@ -1,4 +1,4 @@ | ||
1099 | -#!/usr/bin/python3 | ||
1100 | +#!/usr/bin/python | ||
1101 | |||
1102 | from gi.repository import GLib | ||
1103 | |||
1104 | diff --git a/test/test-stk-menu b/test/test-stk-menu | ||
1105 | index 0cf8fa2..ac0a5bd 100755 | ||
1106 | --- a/test/test-stk-menu | ||
1107 | +++ b/test/test-stk-menu | ||
1108 | @@ -1,4 +1,4 @@ | ||
1109 | -#!/usr/bin/python3 | ||
1110 | +#!/usr/bin/python | ||
1111 | |||
1112 | from gi.repository import GLib | ||
1113 | |||
1114 | @@ -58,7 +58,7 @@ class StkAgent(dbus.service.Object): | ||
1115 | index += 1 | ||
1116 | |||
1117 | print("\nDefault: %d" % (default)) | ||
1118 | - select = input("Enter Selection (t, b):") | ||
1119 | + select = raw_input("Enter Selection (t, b):") | ||
1120 | |||
1121 | if select == 'b': | ||
1122 | raise GoBack("User wishes to go back") | ||
1123 | @@ -75,7 +75,7 @@ class StkAgent(dbus.service.Object): | ||
1124 | print("DisplayText (%s)" % (title)) | ||
1125 | print("Icon: (%d)" % (int(icon))) | ||
1126 | print("Urgent: (%d)" % (urgent)) | ||
1127 | - key = input("Press return to clear ('t' terminates, " | ||
1128 | + key = raw_input("Press return to clear ('t' terminates, " | ||
1129 | "'b' goes back, 'n' busy, " | ||
1130 | "'w' return and wait):") | ||
1131 | |||
1132 | @@ -108,7 +108,7 @@ class StkAgent(dbus.service.Object): | ||
1133 | print("Hide typing: (%s)" % (hide_typing)) | ||
1134 | print("Enter characters, min: %d, max: %d:" % (min_chars, | ||
1135 | max_chars)) | ||
1136 | - userin = input("") | ||
1137 | + userin = raw_input("") | ||
1138 | |||
1139 | return userin | ||
1140 | |||
1141 | @@ -122,7 +122,7 @@ class StkAgent(dbus.service.Object): | ||
1142 | print("Hide typing: (%s)" % (hide_typing)) | ||
1143 | print("Enter digits, min: %d, max: %d:" % (min_chars, | ||
1144 | max_chars)) | ||
1145 | - userin = input("'t' terminates, 'b' goes back:") | ||
1146 | + userin = raw_input("'t' terminates, 'b' goes back:") | ||
1147 | |||
1148 | if userin == 'b': | ||
1149 | raise GoBack("User wishes to go back") | ||
1150 | @@ -136,7 +136,7 @@ class StkAgent(dbus.service.Object): | ||
1151 | def RequestKey(self, title, icon): | ||
1152 | print("Title: (%s)" % (title)) | ||
1153 | print("Icon: (%d)" % (int(icon))) | ||
1154 | - key = input("Enter Key (t, b):") | ||
1155 | + key = raw_input("Enter Key (t, b):") | ||
1156 | |||
1157 | if key == 'b': | ||
1158 | raise GoBack("User wishes to go back") | ||
1159 | @@ -150,7 +150,7 @@ class StkAgent(dbus.service.Object): | ||
1160 | def RequestDigit(self, title, icon): | ||
1161 | print("Title: (%s)" % (title)) | ||
1162 | print("Icon: (%d)" % (int(icon))) | ||
1163 | - key = input("Enter Digit (t, b):") | ||
1164 | + key = raw_input("Enter Digit (t, b):") | ||
1165 | |||
1166 | if key == 'b': | ||
1167 | raise GoBack("User wishes to go back") | ||
1168 | @@ -164,7 +164,7 @@ class StkAgent(dbus.service.Object): | ||
1169 | def RequestQuickDigit(self, title, icon): | ||
1170 | print("Title: (%s)" % (title)) | ||
1171 | print("Icon: (%d)" % (int(icon))) | ||
1172 | - key = input("Quick digit (0-9, *, #, t, b):") | ||
1173 | + key = raw_input("Quick digit (0-9, *, #, t, b):") | ||
1174 | |||
1175 | if key == 'b': | ||
1176 | raise GoBack("User wishes to go back") | ||
1177 | @@ -178,7 +178,7 @@ class StkAgent(dbus.service.Object): | ||
1178 | def RequestConfirmation(self, title, icon): | ||
1179 | print("Title: (%s)" % (title)) | ||
1180 | print("Icon: (%d)" % (int(icon))) | ||
1181 | - key = input("Enter Confirmation (t, b, y, n):") | ||
1182 | + key = raw_input("Enter Confirmation (t, b, y, n):") | ||
1183 | |||
1184 | if key == 'b': | ||
1185 | raise GoBack("User wishes to go back") | ||
1186 | @@ -194,7 +194,7 @@ class StkAgent(dbus.service.Object): | ||
1187 | def ConfirmCallSetup(self, info, icon): | ||
1188 | print("Information: (%s)" % (info)) | ||
1189 | print("Icon: (%d)" % (int(icon))) | ||
1190 | - key = input("Enter Confirmation (t, y, n):") | ||
1191 | + key = raw_input("Enter Confirmation (t, y, n):") | ||
1192 | |||
1193 | if key == 't': | ||
1194 | raise EndSession("User wishes to terminate session") | ||
1195 | @@ -209,7 +209,7 @@ class StkAgent(dbus.service.Object): | ||
1196 | print("Information: (%s)" % (info)) | ||
1197 | print("Icon: (%d)" % (int(icon))) | ||
1198 | print("URL (%s)" % (url)) | ||
1199 | - key = input("Enter Confirmation (y, n):") | ||
1200 | + key = raw_input("Enter Confirmation (y, n):") | ||
1201 | |||
1202 | if key == 'y': | ||
1203 | return True | ||
1204 | @@ -232,7 +232,7 @@ class StkAgent(dbus.service.Object): | ||
1205 | signal.alarm(5) | ||
1206 | |||
1207 | try: | ||
1208 | - key = input("Press return to end before end of" | ||
1209 | + key = raw_input("Press return to end before end of" | ||
1210 | " single tone (t):") | ||
1211 | signal.alarm(0) | ||
1212 | |||
1213 | @@ -250,7 +250,7 @@ class StkAgent(dbus.service.Object): | ||
1214 | print("LoopTone: %s" % (tone)) | ||
1215 | print("Text: %s" % (text)) | ||
1216 | print("Icon: %d" % (int(icon))) | ||
1217 | - key = input("Press return to end before timeout " | ||
1218 | + key = raw_input("Press return to end before timeout " | ||
1219 | "('t' terminates, 'w' return and wait):") | ||
1220 | |||
1221 | if key == 'w': | ||
1222 | @@ -279,7 +279,7 @@ class StkAgent(dbus.service.Object): | ||
1223 | def DisplayAction(self, text, icon): | ||
1224 | print("Text: (%s)" % (text)) | ||
1225 | print("Icon: (%d)" % (int(icon))) | ||
1226 | - key = input("Press 't' to terminate the session ") | ||
1227 | + key = raw_input("Press 't' to terminate the session ") | ||
1228 | |||
1229 | if key == 't': | ||
1230 | raise EndSession("User wishes to terminate session") | ||
1231 | @@ -289,7 +289,7 @@ class StkAgent(dbus.service.Object): | ||
1232 | def ConfirmOpenChannel(self, info, icon): | ||
1233 | print("Open channel confirmation: (%s)" % (info)) | ||
1234 | print("Icon: (%d)" % (int(icon))) | ||
1235 | - key = input("Enter Confirmation (t, y, n):") | ||
1236 | + key = raw_input("Enter Confirmation (t, y, n):") | ||
1237 | |||
1238 | if key == 't': | ||
1239 | raise EndSession("User wishes to terminate session") | ||
1240 | @@ -299,7 +299,7 @@ class StkAgent(dbus.service.Object): | ||
1241 | return False | ||
1242 | |||
1243 | _dbus2py = { | ||
1244 | - dbus.String : str, | ||
1245 | + dbus.String : unicode, | ||
1246 | dbus.UInt32 : int, | ||
1247 | dbus.Int32 : int, | ||
1248 | dbus.Int16 : int, | ||
1249 | @@ -396,7 +396,7 @@ if __name__ == '__main__': | ||
1250 | except: | ||
1251 | pass | ||
1252 | |||
1253 | - select = int(input("Enter Selection: ")) | ||
1254 | + select = int(raw_input("Enter Selection: ")) | ||
1255 | stk.SelectItem(select, path) | ||
1256 | elif mode == 'agent': | ||
1257 | path = "/test/agent" | ||
1258 | diff --git a/test/unlock-pin b/test/unlock-pin | ||
1259 | index 61f4765..10b6626 100755 | ||
1260 | --- a/test/unlock-pin | ||
1261 | +++ b/test/unlock-pin | ||
1262 | @@ -1,4 +1,4 @@ | ||
1263 | -#!/usr/bin/python3 | ||
1264 | +#!/usr/bin/python | ||
1265 | |||
1266 | import dbus | ||
1267 | import sys | ||
1268 | -- | ||
1269 | 1.9.1 | ||
1270 | |||
diff --git a/meta/recipes-connectivity/ofono/ofono_1.17.bb b/meta/recipes-connectivity/ofono/ofono_1.17.bb index 947f9d714a..69f395777d 100644 --- a/meta/recipes-connectivity/ofono/ofono_1.17.bb +++ b/meta/recipes-connectivity/ofono/ofono_1.17.bb | |||
@@ -3,7 +3,6 @@ require ofono.inc | |||
3 | SRC_URI = "\ | 3 | SRC_URI = "\ |
4 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ | 4 | ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ |
5 | file://ofono \ | 5 | file://ofono \ |
6 | file://Revert-test-Convert-to-Python-3.patch \ | ||
7 | " | 6 | " |
8 | SRC_URI[md5sum] = "d280b1d267ba5bf391d2a898fea7c748" | 7 | SRC_URI[md5sum] = "d280b1d267ba5bf391d2a898fea7c748" |
9 | SRC_URI[sha256sum] = "cbf20f07fd15253c682b23c1786d517f505c3688f7c4ea93da777e1523b89635" | 8 | SRC_URI[sha256sum] = "cbf20f07fd15253c682b23c1786d517f505c3688f7c4ea93da777e1523b89635" |