jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #322 from dnephin/fix_cli_for_py26

Browse source 
Fix cli for python 2.6
This commit is contained in:
Chris Corbyn 2014-07-27 18:35:40 +10:00
commit 0dc55fda45
4 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
fig/cli/main.py
View file

@ -24,16 +24,7 @@ log = logging.getLogger(__name__)
def main():
console_handler = logging.StreamHandler(stream=sys.stderr)
console_handler.setFormatter(logging.Formatter())
console_handler.setLevel(logging.INFO)
root_logger = logging.getLogger()
root_logger.addHandler(console_handler)
root_logger.setLevel(logging.DEBUG)
# Disable requests logging
logging.getLogger("requests").propagate = False
setup_logging()
try:
command = TopLevelCommand()
command.sys_dispatch()
@ -56,6 +47,18 @@ def main():
sys.exit(1)
def setup_logging():
console_handler = logging.StreamHandler(sys.stderr)
console_handler.setFormatter(logging.Formatter())
console_handler.setLevel(logging.INFO)
root_logger = logging.getLogger()
root_logger.addHandler(console_handler)
root_logger.setLevel(logging.DEBUG)
# Disable requests logging
logging.getLogger("requests").propagate = False
# stolen from docopt master
def parse_doc_section(name, source):
pattern = re.compile('^([^\n]*' + name + '[^\n]*\n?(?:[ \t].*?(?:\n|$))*)',