diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-06-02 13:12:49 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:31 +0100 |
commit | 5483fa294f164cb613f95e9a254353846962120a (patch) | |
tree | 0d711a8184941fee1d1ed4b3499160e3ecad1097 /scripts/lib | |
parent | 02ac95ab5df879bc7b2a706d320a4ab1b2830f13 (diff) | |
download | poky-5483fa294f164cb613f95e9a254353846962120a.tar.gz |
scripts: python3: rename raw_input to input
Renamed raw_input to input as raw_input does not
exist in python 3.
(From meta-yocto rev: c9df9f2699885f2ba5b031c8761aefbf3c796067)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/bsp/engine.py | 12 | ||||
-rw-r--r-- | scripts/lib/bsp/kernel.py | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/scripts/lib/bsp/engine.py b/scripts/lib/bsp/engine.py index 3ab4295d24..f75454d4b4 100644 --- a/scripts/lib/bsp/engine.py +++ b/scripts/lib/bsp/engine.py | |||
@@ -464,9 +464,9 @@ class ListInputLine(InputLine): | |||
464 | choices_str = self.gen_choices_str(choicepairs) | 464 | choices_str = self.gen_choices_str(choicepairs) |
465 | choices_val_list = self.gen_choices_val_list(choicepairs) | 465 | choices_val_list = self.gen_choices_val_list(choicepairs) |
466 | if checklist: | 466 | if checklist: |
467 | choiceval = default(find_choicevals(raw_input(msg + "\n" + choices_str), choices_val_list), default_choice) | 467 | choiceval = default(find_choicevals(input(msg + "\n" + choices_str), choices_val_list), default_choice) |
468 | else: | 468 | else: |
469 | choiceval = default(find_choiceval(raw_input(msg + "\n" + choices_str), choices_val_list), default_choice) | 469 | choiceval = default(find_choiceval(input(msg + "\n" + choices_str), choices_val_list), default_choice) |
470 | 470 | ||
471 | return choiceval | 471 | return choiceval |
472 | 472 | ||
@@ -540,12 +540,12 @@ def get_verified_git_repo(input_str, name): | |||
540 | """ | 540 | """ |
541 | msg = input_str.strip() + " " | 541 | msg = input_str.strip() + " " |
542 | 542 | ||
543 | giturl = default(raw_input(msg), name) | 543 | giturl = default(input(msg), name) |
544 | 544 | ||
545 | while True: | 545 | while True: |
546 | if verify_git_repo(giturl): | 546 | if verify_git_repo(giturl): |
547 | return giturl | 547 | return giturl |
548 | giturl = default(raw_input(msg), name) | 548 | giturl = default(input(msg), name) |
549 | 549 | ||
550 | 550 | ||
551 | def get_verified_file(input_str, name, filename_can_be_null): | 551 | def get_verified_file(input_str, name, filename_can_be_null): |
@@ -555,14 +555,14 @@ def get_verified_file(input_str, name, filename_can_be_null): | |||
555 | """ | 555 | """ |
556 | msg = input_str.strip() + " " | 556 | msg = input_str.strip() + " " |
557 | 557 | ||
558 | filename = default(raw_input(msg), name) | 558 | filename = default(input(msg), name) |
559 | 559 | ||
560 | while True: | 560 | while True: |
561 | if not filename and filename_can_be_null: | 561 | if not filename and filename_can_be_null: |
562 | return filename | 562 | return filename |
563 | if os.path.isfile(filename): | 563 | if os.path.isfile(filename): |
564 | return filename | 564 | return filename |
565 | filename = default(raw_input(msg), name) | 565 | filename = default(input(msg), name) |
566 | 566 | ||
567 | 567 | ||
568 | def replace_file(replace_this, with_this): | 568 | def replace_file(replace_this, with_this): |
diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py index 5bfa663809..3c4b79854d 100644 --- a/scripts/lib/bsp/kernel.py +++ b/scripts/lib/bsp/kernel.py | |||
@@ -202,8 +202,8 @@ def yocto_kernel_config_rm(scripts_path, machine): | |||
202 | config_items = read_config_items(scripts_path, machine) | 202 | config_items = read_config_items(scripts_path, machine) |
203 | 203 | ||
204 | print("Specify the kernel config items to remove:") | 204 | print("Specify the kernel config items to remove:") |
205 | input = raw_input(gen_choices_str(config_items)) | 205 | inp = input(gen_choices_str(config_items)) |
206 | rm_choices = input.split() | 206 | rm_choices = inp.split() |
207 | rm_choices.sort() | 207 | rm_choices.sort() |
208 | 208 | ||
209 | removed = [] | 209 | removed = [] |
@@ -359,8 +359,8 @@ def yocto_kernel_patch_rm(scripts_path, machine): | |||
359 | patches = read_patch_items(scripts_path, machine) | 359 | patches = read_patch_items(scripts_path, machine) |
360 | 360 | ||
361 | print("Specify the patches to remove:") | 361 | print("Specify the patches to remove:") |
362 | input = raw_input(gen_choices_str(patches)) | 362 | inp = input(gen_choices_str(patches)) |
363 | rm_choices = input.split() | 363 | rm_choices = inp.split() |
364 | rm_choices.sort() | 364 | rm_choices.sort() |
365 | 365 | ||
366 | removed = [] | 366 | removed = [] |
@@ -610,8 +610,8 @@ def yocto_kernel_feature_rm(scripts_path, machine): | |||
610 | features = read_features(scripts_path, machine) | 610 | features = read_features(scripts_path, machine) |
611 | 611 | ||
612 | print("Specify the features to remove:") | 612 | print("Specify the features to remove:") |
613 | input = raw_input(gen_choices_str(features)) | 613 | inp = input(gen_choices_str(features)) |
614 | rm_choices = input.split() | 614 | rm_choices = inp.split() |
615 | rm_choices.sort() | 615 | rm_choices.sort() |
616 | 616 | ||
617 | removed = [] | 617 | removed = [] |