Skip to content

Commit e168097

Browse files
committed
Use Python 3 print function in build scripts
1 parent 1054755 commit e168097

3 files changed

Lines changed: 15 additions & 13 deletions

File tree

bessctl/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ def print_banner(self):
370370

371371
def process_one_line(self):
372372
if self.interactive:
373-
try: # Hack for Python 2/3 compatibi
373+
try: # Hack for Python 2/3 compatibility
374374
input = raw_input
375375
except NameError:
376376
pass

build.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,22 +111,23 @@ def check_c_lib(lib):
111111

112112
def required(header_file, lib_name, compiler):
113113
if not check_header(header_file, compiler):
114-
print >> sys.stderr, 'Error - #include <%s> failed. ' \
115-
'Did you install "%s" package?' % (header_file, lib_name)
114+
print('Error - #include <%s> failed. '
115+
'Did you install "%s" package?'
116+
% (header_file, lib_name), file=sys.stderr)
116117
sys.exit(1)
117118

118119

119120
def check_essential():
120121
if not cmd_success('gcc -v'):
121-
print >> sys.stderr, 'Error - "gcc" is not available'
122+
print('Error - "gcc" is not available', file=sys.stderr)
122123
sys.exit(1)
123124

124125
if not cmd_success('g++ -v'):
125-
print >> sys.stderr, 'Error - "g++" is not available'
126+
print('Error - "g++" is not available', file=sys.stderr)
126127
sys.exit(1)
127128

128129
if not cmd_success('make -v'):
129-
print >> sys.stderr, 'Error - "make" is not available'
130+
print('Error - "make" is not available', file=sys.stderr)
130131
sys.exit(1)
131132

132133
required('pcap/pcap.h', 'libpcap-dev', 'gcc')

container_build.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ def run_cmd(cmd):
1818
proc.communicate()
1919

2020
if proc.returncode:
21-
print >> sys.stderr, 'Error has occured running host command: %s' % cmd
21+
print('Error has occured running host command: %s' % cmd,
22+
file=sys.stderr)
2223
sys.exit(proc.returncode)
2324

2425

@@ -48,7 +49,7 @@ def build_kmod():
4849
try:
4950
run_docker_cmd('%s kmod' % BUILD_SCRIPT)
5051
except:
51-
print >> sys.stderr, '*** module build has failed.'
52+
print('*** module build has failed.', file=sys.stderr)
5253

5354

5455
def build_kmod_buildtest():
@@ -73,10 +74,9 @@ def do_dist_clean():
7374

7475

7576
def print_usage():
76-
print >> sys.stderr, \
77-
'Usage: %s ' \
78-
'[all|bess|kmod|kmod_buildtest|clean|dist_clean|shell||help]' % \
79-
sys.argv[0]
77+
print('Usage: %s '
78+
'[all|bess|kmod|kmod_buildtest|clean|dist_clean|shell||help]'
79+
% sys.argv[0], file=sys.stderr)
8080

8181

8282
def main():
@@ -104,7 +104,8 @@ def main():
104104
print_usage()
105105
sys.exit(0)
106106
else:
107-
print >> sys.stderr, 'Error - unknown command "%s".' % sys.argv[1]
107+
print('Error - unknown command "%s".' % sys.argv[1],
108+
file=sys.stderr)
108109
print_usage()
109110
sys.exit(2)
110111
else:

0 commit comments

Comments
 (0)