From 859b7f893f1daa3ef056cdcde101452527512e8c Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Thu, 25 Feb 2016 11:39:18 -0800 Subject: [PATCH] pull logger straight from logging; use abs imports --- tldp/cascadingconfig.py | 1 - tldp/driver.py | 6 +++--- tldp/inventory.py | 8 +++++--- tldp/outputs.py | 4 +++- tldp/sources.py | 4 +++- tldp/typeguesser.py | 4 +++- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/tldp/cascadingconfig.py b/tldp/cascadingconfig.py index da37fab..7d2be84 100644 --- a/tldp/cascadingconfig.py +++ b/tldp/cascadingconfig.py @@ -10,7 +10,6 @@ from argparse import ArgumentParser, ArgumentError, Namespace from argparse import _UNRECOGNIZED_ARGS_ATTR import logging -logging.basicConfig(stream=sys.stderr, level=logging.WARNING) logger = logging.getLogger() ENVSEP = NSSEP = '_' # -- underscore _ diff --git a/tldp/driver.py b/tldp/driver.py index 5f52852..97a7b57 100644 --- a/tldp/driver.py +++ b/tldp/driver.py @@ -5,8 +5,8 @@ from __future__ import absolute_import, division, print_function import os import sys - -from tldp.utils import logger +import logging +logger = logging.getLogger() import tldp @@ -90,7 +90,7 @@ def run(): # -- first, and foremost, set requested logging level # - logger.setLevel(config.loglevel) + #logger.setLevel(config.loglevel) # -- check to see if the user wishes to --list things # this function and friends is called 'detail', because diff --git a/tldp/inventory.py b/tldp/inventory.py index 5d835ff..26f2564 100644 --- a/tldp/inventory.py +++ b/tldp/inventory.py @@ -4,11 +4,13 @@ from __future__ import absolute_import, division, print_function import copy +import logging +logger = logging.getLogger() -from .utils import logger, max_mtime, mtime_gt +from tldp.utils import max_mtime, mtime_gt -from .sources import SourceCollection -from .outputs import OutputCollection +from tldp.sources import SourceCollection +from tldp.outputs import OutputCollection from argparse import Namespace diff --git a/tldp/outputs.py b/tldp/outputs.py index 4b08a76..fc5034a 100644 --- a/tldp/outputs.py +++ b/tldp/outputs.py @@ -7,9 +7,11 @@ import os import sys import errno import shutil +import logging +logger = logging.getLogger() from tldp.ldpcollection import LDPDocumentCollection -from tldp.utils import logger, logdir, statfiles +from tldp.utils import logdir, statfiles class OutputNamingConvention(object): diff --git a/tldp/sources.py b/tldp/sources.py index 8f2685d..efb3992 100644 --- a/tldp/sources.py +++ b/tldp/sources.py @@ -6,10 +6,12 @@ from __future__ import absolute_import, division, print_function import os import sys import errno +import logging +logger = logging.getLogger() from tldp.ldpcollection import LDPDocumentCollection -from tldp.utils import logger, statfiles, stem_and_ext +from tldp.utils import statfiles, stem_and_ext from tldp.typeguesser import guess, knownextensions diff --git a/tldp/typeguesser.py b/tldp/typeguesser.py index 05521c9..1addba9 100644 --- a/tldp/typeguesser.py +++ b/tldp/typeguesser.py @@ -5,8 +5,10 @@ from __future__ import absolute_import, division, print_function import os import inspect +import logging +logger = logging.getLogger() -from tldp.utils import logger, makefh +from tldp.utils import makefh import tldp.doctypes