Merge pull request #280 from pimutils/click-log-again

Reintroduce click-log

Author: Hugo Osvaldo Barrera

CHANGELOG.rst

@@ -4,6 +4,11 @@ Changelog
 This file contains a brief summary of new features and dependency changes or
 releases, in reverse chronological order.
 
+v3.3.0
+------
+
+* New runtime dependency: ``click-log``.
+
 v3.2.4
 ------
 

requirements.txt

@@ -1,5 +1,6 @@
 atomicwrites
 click>=6.0
+click_log
 configobj
 humanize
 icalendar

todoman/cli.py

@@ -1,20 +1,23 @@
 import functools
 import glob
 import locale
-import logging
 import sys
 from contextlib import contextmanager
 from datetime import timedelta
 from os.path import expanduser, isdir
 
 import click
+import click_log
 
 from todoman import exceptions, formatters
 from todoman.configuration import ConfigurationException, load_config
 from todoman.interactive import TodoEditor
 from todoman.model import cached_property, Database, Todo
 
 
+click_log.basic_config()
+
+
 @contextmanager
 def handle_error():
     try:
@@ -194,13 +197,7 @@ def formatter(self):
 
 
 @click.group(invoke_without_command=True)
-@click.option(
-    '-v',
-    '--verbosity',
-    type=click.Choice(['CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG']),
-    help='Set verbosity to the given level.',
-    default='WARNING',
-)
+@click_log.simple_verbosity_option()
 @click.option('--colour', '--color', default=None,
               type=click.Choice(['always', 'auto', 'never']),
               help=('By default todoman will disable colored output if stdout '
@@ -214,8 +211,7 @@ def formatter(self):
 @click.pass_context
 @click.version_option(prog_name='todoman')
 @catch_errors
-def cli(click_ctx, color, porcelain, humanize, verbosity):
-    logging.basicConfig(level=verbosity)
+def cli(click_ctx, color, porcelain, humanize):
     ctx = click_ctx.ensure_object(AppContext)
     try:
         ctx.config = load_config()