Clean up logging usage

vdirsyncer/cli/__init__.py

@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-
 
 import functools
+import logging
 import sys
 
 import click
 
 import click_log
 
-from .. import __version__, log
+from .. import __version__
 from ..utils.compat import PY2
 
 
-cli_logger = log.get(__name__)
+cli_logger = logging.getLogger(__name__)
 
 
 class AppContext(object):
@@ -38,7 +39,7 @@ def catch_errors(f):
 
 
 def validate_verbosity(ctx, param, value):
-    x = getattr(log.logging, value.upper(), None)
+    x = getattr(logging.getLogger, value.upper(), None)
     if x is None:
         raise click.BadParameter(
             'Must be CRITICAL, ERROR, WARNING, INFO or DEBUG, not {}'
@@ -75,7 +76,7 @@ main = app
 
 
 def max_workers_callback(ctx, param, value):
-    if value == 0 and click_log.get_level() == log.logging.DEBUG:
+    if value == 0 and click_log.get_level() == logging.DEBUG:
         value = 1
 
     cli_logger.debug('Using {} maximal workers.'.format(value))

vdirsyncer/cli/fetchparams.py

@@ -1,14 +1,16 @@
 # -*- coding: utf-8 -*-
 
+import logging
+
 import click
 
 from . import AppContext
-from .. import exceptions, log
+from .. import exceptions
 from ..utils import expand_path, synchronized
 
 SUFFIX = '.fetch'
 
-logger = log.get(__name__)
+logger = logging.getLogger(__name__)
 
 
 def expand_fetch_params(config):

vdirsyncer/log.py

@@ -1,5 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import logging
-
-get = logging.getLogger

vdirsyncer/metasync.py

@@ -1,7 +1,9 @@
-from . import exceptions, log
+import logging
+
+from . import exceptions
 from .storage.base import normalize_meta_value
 
-logger = log.get(__name__)
+logger = logging.getLogger(__name__)
 
 
 class MetaSyncError(exceptions.Error):

vdirsyncer/repair.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 
+import logging
 from os.path import basename
 
-
-from . import log
 from .utils import generate_href, href_safe
 from .utils.vobject import Item
 
-logger = log.get(__name__)
+logger = logging.getLogger(__name__)
 
 
 def repair_storage(storage):

vdirsyncer/storage/dav.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import datetime
+import logging
 
 from lxml import etree
 
@@ -10,11 +11,11 @@ from requests.exceptions import HTTPError
 from .base import Item, Storage, normalize_meta_value
 from .http import HTTP_STORAGE_PARAMETERS, USERAGENT, prepare_auth, \
     prepare_client_cert, prepare_verify
-from .. import exceptions, log, utils
+from .. import exceptions, utils
 from ..utils.compat import text_type, to_native
 
 
-dav_logger = log.get(__name__)
+dav_logger = logging.getLogger(__name__)
 
 CALDAV_DT_FORMAT = '%Y%m%dT%H%M%SZ'
 

vdirsyncer/storage/filesystem.py

@@ -1,18 +1,19 @@
 # -*- coding: utf-8 -*-
 
 import errno
+import logging
 import os
 import subprocess
 
 from atomicwrites import atomic_write
 
 from .base import Item, Storage, normalize_meta_value
-from .. import exceptions, log
+from .. import exceptions
 from ..utils import checkdir, expand_path, generate_href, get_etag_from_file, \
     get_etag_from_fileobject
 from ..utils.compat import text_type, to_native
 
-logger = log.get(__name__)
+logger = logging.getLogger(__name__)
 
 
 class FilesystemStorage(Storage):

vdirsyncer/storage/remotestorage.py

@@ -17,18 +17,20 @@ We also use a custom ``data``-URI for the redirect in OAuth:
 
 '''
 
+import logging
+
 import click
 
 from .base import Item, Storage, normalize_meta_value
 from .http import HTTP_STORAGE_PARAMETERS, prepare_client_cert, \
     prepare_verify
-from .. import exceptions, log, utils
+from .. import exceptions, utils
 
 REDIRECT_URI = 'https://vdirsyncer.5apps.com/'
 CLIENT_ID = 'https://vdirsyncer.5apps.com'
 DRAFT_VERSION = '05'
 
-logger = log.get(__name__)
+logger = logging.getLogger(__name__)
 
 urljoin = utils.compat.urlparse.urljoin
 urlquote = utils.compat.urlquote

vdirsyncer/storage/singlefile.py

@@ -3,17 +3,18 @@
 import collections
 import contextlib
 import functools
+import logging
 import os
 
 from atomicwrites import atomic_write
 
 from .base import Item, Storage
-from .. import exceptions, log
+from .. import exceptions
 from ..utils import checkfile, expand_path
 from ..utils.compat import iteritems, itervalues
 from ..utils.vobject import join_collection, split_collection
 
-logger = log.get(__name__)
+logger = logging.getLogger(__name__)
 
 
 def _writing_op(f):

vdirsyncer/sync.py

@@ -10,11 +10,13 @@ The algorithm is based on the blogpost "How OfflineIMAP works" by Edward Z.
 Yang. http://blog.ezyang.com/2012/08/how-offlineimap-works/
 '''
 import itertools
+import logging
 
-from . import exceptions, log
+from . import exceptions
 from .utils import uniq
 from .utils.compat import iteritems, text_type
-sync_logger = log.get(__name__)
+
+sync_logger = logging.getLogger(__name__)
 
 
 class SyncError(exceptions.Error):

vdirsyncer/utils/http.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
+import logging
 
 import requests
 
-from .. import exceptions, log
+from .. import exceptions
 
 
-logger = log.get(__name__)
+logger = logging.getLogger(__name__)
 
 
 def _install_fingerprint_adapter(session, fingerprint):