mirror of https://github.com/docker/docs.git
Use sys.exit instead of global
This commit is contained in:
parent
51131813a3
commit
05e15e27ef
|
@ -8,6 +8,7 @@ import os
|
||||||
import re
|
import re
|
||||||
import yaml
|
import yaml
|
||||||
import six
|
import six
|
||||||
|
import sys
|
||||||
|
|
||||||
from ..project import Project
|
from ..project import Project
|
||||||
from ..service import ConfigError
|
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:
|
else:
|
||||||
log.error(e)
|
log.error(e)
|
||||||
|
|
||||||
exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return Project.from_config(self.project_name, config, self.client)
|
return Project.from_config(self.project_name, config, self.client)
|
||||||
|
|
|
@ -39,18 +39,18 @@ def main():
|
||||||
command.sys_dispatch()
|
command.sys_dispatch()
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
log.error("\nAborting.")
|
log.error("\nAborting.")
|
||||||
exit(1)
|
sys.exit(1)
|
||||||
except (UserError, NoSuchService, DependencyError) as e:
|
except (UserError, NoSuchService, DependencyError) as e:
|
||||||
log.error(e.msg)
|
log.error(e.msg)
|
||||||
exit(1)
|
sys.exit(1)
|
||||||
except NoSuchCommand as e:
|
except NoSuchCommand as e:
|
||||||
log.error("No such command: %s", e.command)
|
log.error("No such command: %s", e.command)
|
||||||
log.error("")
|
log.error("")
|
||||||
log.error("\n".join(parse_doc_section("commands:", getdoc(e.supercommand))))
|
log.error("\n".join(parse_doc_section("commands:", getdoc(e.supercommand))))
|
||||||
exit(1)
|
sys.exit(1)
|
||||||
except APIError as e:
|
except APIError as e:
|
||||||
log.error(e.explanation)
|
log.error(e.explanation)
|
||||||
exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
# stolen from docopt master
|
# stolen from docopt master
|
||||||
|
|
|
@ -115,7 +115,7 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
if len(sys.argv) != 2:
|
if len(sys.argv) != 2:
|
||||||
sys.stderr.write("Usage: python socketclient.py WEBSOCKET_URL\n")
|
sys.stderr.write("Usage: python socketclient.py WEBSOCKET_URL\n")
|
||||||
exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
url = sys.argv[1]
|
url = sys.argv[1]
|
||||||
socket = websocket.create_connection(url)
|
socket = websocket.create_connection(url)
|
||||||
|
|
Loading…
Reference in New Issue