Merge pull request #33993 from s0undt3ch/2016.3

Call `sys.exit()` instead of `exit()`
saltstack · Jun 14, 2016 · 26fee37 · 26fee37
2 parents 2e934cf + 34f7d90
commit 26fee37
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/salt/minion.py b/salt/minion.py
@@ -865,7 +865,7 @@ def _handle_signals(self, signum, sigframe):  # pylint: disable=unused-argument
         self.process_manager.send_signal_to_processes(signum)
         # kill any remaining processes
         self.process_manager.kill_children()
-        exit(0)
+        sys.exit(0)
 
     def sync_connect_master(self, timeout=None):
         '''

diff --git a/salt/scripts.py b/salt/scripts.py
@@ -92,7 +92,7 @@ def suicide_when_without_parent(parent_pid):
         delay = randint(1, delay)
         log.info('waiting random_reauth_delay {0}s'.format(delay))
         time.sleep(delay)
-        exit(salt.defaults.exitcodes.SALT_KEEPALIVE)
+        sys.exit(salt.defaults.exitcodes.SALT_KEEPALIVE)
 
 
 def salt_minion():

diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
@@ -6,6 +6,7 @@
 # Import Python Libs
 from __future__ import absolute_import
 import os
+import sys
 import copy
 import errno
 import signal
@@ -636,7 +637,7 @@ def _handle_signals(self, signum, sigframe):
             msg += 'SIGTERM'
         msg += '. Exiting'
         log.debug(msg)
-        exit(salt.defaults.exitcodes.EX_OK)
+        sys.exit(salt.defaults.exitcodes.EX_OK)
 
 
 class ZeroMQPubServerChannel(salt.transport.server.PubServerChannel):

diff --git a/salt/utils/process.py b/salt/utils/process.py
@@ -652,7 +652,7 @@ def _handle_signals(self, signum, sigframe):
             msg += 'SIGTERM'
         msg += '. Exiting'
         log.debug(msg)
-        exit(salt.defaults.exitcodes.EX_OK)
+        sys.exit(salt.defaults.exitcodes.EX_OK)
 
     def start(self):
         with default_signals(signal.SIGINT, signal.SIGTERM):

diff --git a/salt/utils/schedule.py b/salt/utils/schedule.py
@@ -256,6 +256,7 @@
 # Import python libs
 from __future__ import absolute_import, with_statement
 import os
+import sys
 import time
 import signal
 import datetime
@@ -788,7 +789,7 @@ def handle_func(self, multiprocessing_enabled, func, data):
             finally:
                 if multiprocessing_enabled:
                     # Let's make sure we exit the process!
-                    exit(salt.defaults.exitcodes.EX_GENERIC)
+                    sys.exit(salt.defaults.exitcodes.EX_GENERIC)
 
     def eval(self):
         '''