Skip to content

Commit 7013eea

Browse files
benjaminpHyukjinKwon
authored andcommitted
[SPARK-23522][PYTHON] always use sys.exit over builtin exit
The exit() builtin is only for interactive use. applications should use sys.exit(). ## What changes were proposed in this pull request? All usage of the builtin `exit()` function is replaced by `sys.exit()`. ## How was this patch tested? I ran `python/run-tests`. Please review http://spark.apache.org/contributing.html before opening a pull request. Author: Benjamin Peterson <[email protected]> Closes #20682 from benjaminp/sys-exit.
1 parent 2cb23a8 commit 7013eea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+120
-86
lines changed

dev/merge_spark_pr.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ def main():
510510
import doctest
511511
(failure_count, test_count) = doctest.testmod()
512512
if failure_count:
513-
exit(-1)
513+
sys.exit(-1)
514514
try:
515515
main()
516516
except:

dev/run-tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ def _test():
621621
import doctest
622622
failure_count = doctest.testmod()[0]
623623
if failure_count:
624-
exit(-1)
624+
sys.exit(-1)
625625

626626
if __name__ == "__main__":
627627
_test()

examples/src/main/python/avro_inputformat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
Assumes you have Avro data stored in <data_file>. Reader schema can be optionally specified
6262
in [reader_schema_file].
6363
""", file=sys.stderr)
64-
exit(-1)
64+
sys.exit(-1)
6565

6666
path = sys.argv[1]
6767

examples/src/main/python/kmeans.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def closestPoint(p, centers):
4949

5050
if len(sys.argv) != 4:
5151
print("Usage: kmeans <file> <k> <convergeDist>", file=sys.stderr)
52-
exit(-1)
52+
sys.exit(-1)
5353

5454
print("""WARN: This is a naive implementation of KMeans Clustering and is given
5555
as an example! Please refer to examples/src/main/python/ml/kmeans_example.py for an

examples/src/main/python/logistic_regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def readPointBatch(iterator):
4848

4949
if len(sys.argv) != 3:
5050
print("Usage: logistic_regression <file> <iterations>", file=sys.stderr)
51-
exit(-1)
51+
sys.exit(-1)
5252

5353
print("""WARN: This is a naive implementation of Logistic Regression and is
5454
given as an example!

examples/src/main/python/ml/dataframe_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
if __name__ == "__main__":
3434
if len(sys.argv) > 2:
3535
print("Usage: dataframe_example.py <libsvm file>", file=sys.stderr)
36-
exit(-1)
36+
sys.exit(-1)
3737
elif len(sys.argv) == 2:
3838
input = sys.argv[1]
3939
else:

examples/src/main/python/mllib/correlations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
if __name__ == "__main__":
3232
if len(sys.argv) not in [1, 2]:
3333
print("Usage: correlations (<file>)", file=sys.stderr)
34-
exit(-1)
34+
sys.exit(-1)
3535
sc = SparkContext(appName="PythonCorrelations")
3636
if len(sys.argv) == 2:
3737
filepath = sys.argv[1]

examples/src/main/python/mllib/kmeans.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def parseVector(line):
3636
if __name__ == "__main__":
3737
if len(sys.argv) != 3:
3838
print("Usage: kmeans <file> <k>", file=sys.stderr)
39-
exit(-1)
39+
sys.exit(-1)
4040
sc = SparkContext(appName="KMeans")
4141
lines = sc.textFile(sys.argv[1])
4242
data = lines.map(parseVector)

examples/src/main/python/mllib/logistic_regression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def parsePoint(line):
4242
if __name__ == "__main__":
4343
if len(sys.argv) != 3:
4444
print("Usage: logistic_regression <file> <iterations>", file=sys.stderr)
45-
exit(-1)
45+
sys.exit(-1)
4646
sc = SparkContext(appName="PythonLR")
4747
points = sc.textFile(sys.argv[1]).map(parsePoint)
4848
iterations = int(sys.argv[2])

examples/src/main/python/mllib/random_rdd_generation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
if __name__ == "__main__":
3030
if len(sys.argv) not in [1, 2]:
3131
print("Usage: random_rdd_generation", file=sys.stderr)
32-
exit(-1)
32+
sys.exit(-1)
3333

3434
sc = SparkContext(appName="PythonRandomRDDGeneration")
3535

0 commit comments

Comments
 (0)