Skip to content

Commit 481d274

Browse files
authored
HIVE-25817: Add parentheses to print statements for python3 compatibility (#6100)
1 parent 01d161a commit 481d274

File tree

16 files changed

+62
-51
lines changed

16 files changed

+62
-51
lines changed

data/scripts/cat.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
# specific language governing permissions and limitations
1717
# under the License.
1818
#
19+
from __future__ import print_function
1920
import sys, re
2021
import datetime
2122
import os
2223

2324
table_name=None
24-
if os.environ.has_key('hive_streaming_tablename'):
25+
if 'hive_streaming_tablename' in os.environ:
2526
table_name=os.environ['hive_streaming_tablename']
2627

2728
for line in sys.stdin:
28-
print line
29-
print >> sys.stderr, "dummy"
29+
print(line)
30+
print("dummy", file=sys.stderr)

data/scripts/cat_error.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
import sys
2020

2121
for line in sys.stdin:
22-
print line
22+
print(line)
2323

2424
sys.exit(1)

data/scripts/doubleescapedtab.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
import sys
2020

2121
for line in sys.stdin:
22-
print "1\\\\\\t2"
23-
print "1\\\\\\\\t2"
22+
print("1\\\\\\t2")
23+
print("1\\\\\\\\t2")
2424

data/scripts/dumpdata_script.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,15 @@
1818
#
1919
import sys
2020

21-
for i in xrange(50):
22-
for j in xrange(5):
23-
for k in xrange(20022):
24-
print 20000 * i + k
21+
try:
22+
range
23+
except NameError:
24+
range=xrange
25+
26+
for i in range(50):
27+
for j in range(5):
28+
for k in range(20022):
29+
print(20000 * i + k)
2530

2631
for line in sys.stdin:
2732
pass

data/scripts/escapedcarriagereturn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
import sys
2020

2121
for line in sys.stdin:
22-
print "1\\\\r2"
22+
print("1\\\\r2")
2323

data/scripts/escapednewline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
import sys
2020

2121
for line in sys.stdin:
22-
print "1\\\\n2"
22+
print("1\\\\n2")
2323

data/scripts/escapedtab.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
import sys
2020

2121
for line in sys.stdin:
22-
print "1\\\\t2"
22+
print("1\\\\t2")
2323

data/scripts/input20_script.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import re
2121
dict = {}
2222
for line in sys.stdin.readlines():
23-
if dict.has_key(line):
23+
if line in dict:
2424
x = dict[line]
2525
dict[line] = x + 1
2626
else:
2727
dict[line] = 1
2828
for key in dict:
2929
x = dict[key]
30-
print str(x).strip()+'\t'+re.sub('\t','_',key.strip())
30+
print(str(x).strip()+'\t'+re.sub('\t','_',key.strip()))

data/scripts/newline.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
import sys
2020

2121
for line in sys.stdin:
22-
print "1\\n2"
23-
print "1\\r2"
24-
print "1\\t2"
22+
print("1\\n2")
23+
print("1\\r2")
24+
print("1\\t2")

hcatalog/bin/hcat.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,16 @@
140140

141141

142142
if debug == 1:
143-
print "Would run:"
144-
print "exec " + str(cmd)
145-
print " with HADOOP_CLASSPATH set to %s" % (os.environ['HADOOP_CLASSPATH'])
143+
print("Would run:")
144+
print("exec " + str(cmd))
145+
print(" with HADOOP_CLASSPATH set to %s" % (os.environ['HADOOP_CLASSPATH']))
146146
try:
147-
print " and HADOOP_OPTS set to %s" % (os.environ['HADOOP_OPTS'])
147+
print(" and HADOOP_OPTS set to %s" % (os.environ['HADOOP_OPTS']))
148148
except:
149149
pass
150150
else:
151151
if dumpClasspath == 1:
152-
print os.environ['HADOOP_CLASSPATH']
152+
print(os.environ['HADOOP_CLASSPATH'])
153153
else:
154154
if os.name == "posix":
155155
retval = subprocess.call(cmd)

0 commit comments

Comments
 (0)