Merge lp:~vila/uci-engine/fix-run-python into lp:uci-engine

[Vincent Ladeuil]

Fix more bare exit() (instead of sys.exit()) calls.

I ran into another exit() call (instead of sys.exit()) in run-python so I fixed it.

I then found a couple of other call sites and fixed them too.

See https://code.launchpad.net/~vila/uci-engine/1314179-sys-exit/+merge/217593 for details.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:842
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1585/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1585/rebuild

review: Approve (continuous-integration)

[Evan (ev)]

I think this is a good opportunity to start adding some static analysis checks, both for clear errors like this and style adherence.

Would you mind adding a small test that does something like:

grep '\(^\| \)exit(' * -rsI && echo "The exit constant should not be used outside the interactive interpreter. Please use sys.exit(). https://docs.python.org/2/library/constants.html#exit"

Otherwise looks good.

review: Approve

=== modified file 'charms/precise/chroot-builder/hooks/hooks.py'
--- charms/precise/chroot-builder/hooks/hooks.py	2014-10-07 10:04:01 +0000
+++ charms/precise/chroot-builder/hooks/hooks.py	2014-10-14 09:09:16 +0000
@@ -192,4 +192,4 @@
 
 
 if __name__ == '__main__':
-    exit(main())
+    sys.exit(main())

=== modified file 'charms/precise/system-image-server/hooks/hooks.py'
--- charms/precise/system-image-server/hooks/hooks.py	2014-05-29 17:00:29 +0000
+++ charms/precise/system-image-server/hooks/hooks.py	2014-10-14 09:09:16 +0000
@@ -153,4 +153,4 @@
     start(charmconfig)
 
 if __name__ == '__main__':
-    exit(main())
+    sys.exit(main())

=== modified file 'run-python'
--- run-python	2014-10-07 10:04:01 +0000
+++ run-python	2014-10-14 09:09:16 +0000
@@ -1,14 +1,31 @@
 #!/usr/bin/env python
+# Ubuntu CI Engine
+# Copyright 2014 Canonical Ltd.
+
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Affero General Public License version 3, as
+# published by the Free Software Foundation.
+
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU Affero General Public License for more details.
+
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import sys
 
 
+HERE = os.path.abspath(os.path.dirname(__file__))
+
+
 def _usage():
     print('Usage: %s script [arg [arg...]]' % sys.argv[0])
     print('Sets up a PYTHONPATH with our ci-utils so that python scripts '
           'can be launched properly')
-    exit(0)
+    sys.exit(0)
 
 
 def _parse_args(args):
@@ -21,7 +38,7 @@
     '''return the path to the component of the script'''
     script = os.path.abspath(script)
     if basedir not in script:
-        exit('ERROR: scripts must reside in source tree')
+        sys.exit('ERROR: scripts must reside in source tree')
     script = script[len(basedir) + 1:]
     return script.split('/')[0]
 
@@ -29,9 +46,8 @@
 def main(args):
     script, args = _parse_args(args)
 
-    here = os.path.abspath(os.path.dirname(__file__))
-    ci_utils = os.path.join(here, 'ci-utils')
-    comp = _component_path(here, script)
+    ci_utils = os.path.join(HERE, 'ci-utils')
+    comp = _component_path(HERE, script)
 
     python_path = os.environ.get('PYTHONPATH')
     if python_path:
@@ -42,5 +58,6 @@
 
     os.execv(script, args)
 
+
 if __name__ == '__main__':
-    exit(main(sys.argv[1:]))
+    sys.exit(main(sys.argv[1:]))