Apply Python 3 futurize transform libmodernize.fixes.fix_input_six.
This commit is contained in:
parent
239d080616
commit
f714cd15a9
|
@ -11,6 +11,7 @@ from __future__ import print_function
|
||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
import sys
|
import sys
|
||||||
import six
|
import six
|
||||||
|
from six.moves import input
|
||||||
if sys.hexversion < 0x02040000:
|
if sys.hexversion < 0x02040000:
|
||||||
# The limiter is the subprocess module
|
# The limiter is the subprocess module
|
||||||
sys.stderr.write("git-p4: requires Python 2.4 or later.\n")
|
sys.stderr.write("git-p4: requires Python 2.4 or later.\n")
|
||||||
|
@ -1213,7 +1214,7 @@ class P4Submit(Command, P4UserMap):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
while 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':
|
if response == 'y':
|
||||||
return True
|
return True
|
||||||
if response == 'n':
|
if response == 'n':
|
||||||
|
@ -1707,7 +1708,7 @@ class P4Submit(Command, P4UserMap):
|
||||||
# prompt for what to do, or use the option/variable
|
# prompt for what to do, or use the option/variable
|
||||||
if self.conflict_behavior == "ask":
|
if self.conflict_behavior == "ask":
|
||||||
print("What do you want to do?")
|
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? ")
|
" the rest, or [q]uit? ")
|
||||||
if not response:
|
if not response:
|
||||||
continue
|
continue
|
||||||
|
|
Loading…
Reference in a new issue