Use sys.exit instead of global

This commit is contained in:
Ben Firshman 2014-02-19 22:42:21 +00:00
parent 51131813a3
commit 05e15e27ef
3 changed files with 7 additions and 6 deletions

View File

@ -8,6 +8,7 @@ import os
import re
import yaml
import six
import sys
from ..project import Project
from ..service import ConfigError
@ -69,7 +70,7 @@ If it's at a non-standard location, specify the URL with the DOCKER_HOST environ
else:
log.error(e)
exit(1)
sys.exit(1)
try:
return Project.from_config(self.project_name, config, self.client)

View File

@ -39,18 +39,18 @@ def main():
command.sys_dispatch()
except KeyboardInterrupt:
log.error("\nAborting.")
exit(1)
sys.exit(1)
except (UserError, NoSuchService, DependencyError) as e:
log.error(e.msg)
exit(1)
sys.exit(1)
except NoSuchCommand as e:
log.error("No such command: %s", e.command)
log.error("")
log.error("\n".join(parse_doc_section("commands:", getdoc(e.supercommand))))
exit(1)
sys.exit(1)
except APIError as e:
log.error(e.explanation)
exit(1)
sys.exit(1)
# stolen from docopt master

View File

@ -115,7 +115,7 @@ if __name__ == '__main__':
if len(sys.argv) != 2:
sys.stderr.write("Usage: python socketclient.py WEBSOCKET_URL\n")
exit(1)
sys.exit(1)
url = sys.argv[1]
socket = websocket.create_connection(url)