mirror of https://github.com/axmolengine/axmol.git
Python3 no raw_input
This commit is contained in:
parent
2b52ce5613
commit
97fe5954de
|
@ -80,7 +80,11 @@ class CocosZipInstaller(object):
|
||||||
print("==> version file doesn't exist")
|
print("==> version file doesn't exist")
|
||||||
|
|
||||||
def get_input_value(self, prompt):
|
def get_input_value(self, prompt):
|
||||||
ret = raw_input(prompt)
|
ret = ""
|
||||||
|
if(sys.version_info.major >= 3):
|
||||||
|
ret = input(prompt)
|
||||||
|
else:
|
||||||
|
ret = raw_input(prompt)
|
||||||
ret.rstrip(" \t")
|
ret.rstrip(" \t")
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
|
@ -462,13 +462,13 @@ class AndroidBuilder(object):
|
||||||
if build_64bit or build_other_arch:
|
if build_64bit or build_other_arch:
|
||||||
if build_64bit:
|
if build_64bit:
|
||||||
if build_other_arch:
|
if build_other_arch:
|
||||||
print 'build 64bit and 32bit'
|
print('build 64bit and 32bit')
|
||||||
return self.LuaBuildArch.BUILD_32BIT_AND_64BIT
|
return self.LuaBuildArch.BUILD_32BIT_AND_64BIT
|
||||||
else:
|
else:
|
||||||
print 'only build 64bit'
|
print('only build 64bit')
|
||||||
return self.LuaBuildArch.ONLY_BUILD_64BIT
|
return self.LuaBuildArch.ONLY_BUILD_64BIT
|
||||||
else:
|
else:
|
||||||
print 'only build 32bit'
|
print('only build 32bit')
|
||||||
return self.LuaBuildArch.ONLY_BUILD_32BIT
|
return self.LuaBuildArch.ONLY_BUILD_32BIT
|
||||||
|
|
||||||
return self.LuaBuildArch.UNKNOWN
|
return self.LuaBuildArch.UNKNOWN
|
||||||
|
@ -624,7 +624,7 @@ class AndroidBuilder(object):
|
||||||
cocos.Logging.warning(tip_msg)
|
cocos.Logging.warning(tip_msg)
|
||||||
ret = None
|
ret = None
|
||||||
while True:
|
while True:
|
||||||
ret = raw_input()
|
ret = cocos.get_input()
|
||||||
break
|
break
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
|
@ -386,7 +386,7 @@ class Templates(object):
|
||||||
cocos.Logging.warning('%d %s' % (i + 1, p[i]))
|
cocos.Logging.warning('%d %s' % (i + 1, p[i]))
|
||||||
cocos.Logging.warning(MultiLanguage.get_string('NEW_SELECT_TEMPLATE_TIP2'))
|
cocos.Logging.warning(MultiLanguage.get_string('NEW_SELECT_TEMPLATE_TIP2'))
|
||||||
while True:
|
while True:
|
||||||
option = raw_input()
|
option = cocos.get_input()
|
||||||
if option.isdigit():
|
if option.isdigit():
|
||||||
option = int(option) - 1
|
option = int(option) - 1
|
||||||
if option in range(len(p)):
|
if option in range(len(p)):
|
||||||
|
|
Loading…
Reference in New Issue