mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-03 23:36:11 +02:00
Code

git-p4: use python3's input() everywhere 

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>
This commit is contained in:
Yang Zhao 2019-12-13 15:52:47 -08:00 committed by Junio C Hamano
parent ce425eb4e1
commit 7575f4fdec
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-p4.py
View File

@ -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
@ -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':
@ -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