Skip to content

Commit

Permalink
git-p4: use python3's input() everywhere
Browse files Browse the repository at this point in the history
Python3 deprecates raw_input() from 2.7 and replaced it with input().
Since we do not need 2.7's input() semantics, `raw_input()` is aliased
to `input()` for easy forward compatability.

Signed-off-by: Yang Zhao <yang.zhao@skyboxlabs.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
yangskyboxlabs authored and gitster committed Jan 15, 2020
1 parent ce425eb commit 7575f4f
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions git-p4.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@
import ctypes
import errno

# On python2.7 where raw_input() and input() are both availble,
# we want raw_input's semantics, but aliased to input for python3
# compatibility
# support basestring in python3
try:
if raw_input and input:
input = raw_input
except:
pass

verbose = False

# Only labels/tags matching this will be imported/exported
Expand Down Expand Up @@ -1801,7 +1811,7 @@ def edit_template(self, template_file):
return True

while True:
response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
response = input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
if response == 'y':
return True
if response == 'n':
Expand Down Expand Up @@ -2372,7 +2382,7 @@ def run(self, args):
# prompt for what to do, or use the option/variable
if self.conflict_behavior == "ask":
print("What do you want to do?")
response = raw_input("[s]kip this commit but apply"
response = input("[s]kip this commit but apply"
" the rest, or [q]uit? ")
if not response:
continue
Expand Down

0 comments on commit 7575f4f

Please sign in to comment.