The Mac build system should use Python3 only

This commit is contained in:
Kazunari Sekigawa 2022-11-10 21:20:14 +09:00
parent ea2486eaed
commit 9ba6c38fa1
2 changed files with 6 additions and 14 deletions

View File

@ -1,4 +1,4 @@
#! /usr/bin/env python #! /usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
#======================================================================================== #========================================================================================
@ -10,7 +10,6 @@
# #
# This file is imported by 'build4mac.py' script. # This file is imported by 'build4mac.py' script.
#======================================================================================== #========================================================================================
from __future__ import print_function # to use print() of Python 3 in Python >= 2.7
import sys import sys
import os import os
import re import re

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
#=============================================================================== #===============================================================================
@ -10,12 +10,10 @@
# #
# This script must be copied to a "*.macQAT/" directory to run. # This script must be copied to a "*.macQAT/" directory to run.
#=============================================================================== #===============================================================================
from __future__ import print_function # to use print() of Python 3 in Python >= 2.7
import sys import sys
import os import os
import datetime import datetime
from time import sleep from time import sleep
import six
import platform import platform
import optparse import optparse
import subprocess import subprocess
@ -201,15 +199,10 @@ def ExportEnvVariables():
# @param[in] logfile log file name # @param[in] logfile log file name
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
def RunTester( command, logfile="" ): def RunTester( command, logfile="" ):
if six.PY3: proc = subprocess.Popen( command.split(),
proc = subprocess.Popen( command.split(), stdout=subprocess.PIPE, \
stdout=subprocess.PIPE, \ stderr=subprocess.STDOUT, \
stderr=subprocess.STDOUT, \ universal_newlines=True )
universal_newlines=True )
else:
proc = subprocess.Popen( command.split(),
stdout=subprocess.PIPE, \
stderr=subprocess.STDOUT )
if not logfile == "": if not logfile == "":
with proc.stdout, open( logfile, 'w' ) as file: with proc.stdout, open( logfile, 'w' ) as file: