From e74197eb01b284daf45adb1c01e1d8317d9e8822 Mon Sep 17 00:00:00 2001 From: "Martin A. Brown" Date: Thu, 25 Feb 2016 11:37:14 -0800 Subject: [PATCH] pull logger straight from logging; add BaseDoctype rely directly on the logging module directly instead of through tldp.utils add the BaseDoctype to all of the modules (even though not all are implemented) --- tldp/doctypes/asciidoc.py | 7 +++++-- tldp/doctypes/common.py | 5 ++++- tldp/doctypes/docbook4xml.py | 5 ++++- tldp/doctypes/docbook5xml.py | 11 ++++++++--- tldp/doctypes/docbooksgml.py | 4 +++- tldp/doctypes/example.py | 9 +++++++-- tldp/doctypes/linuxdoc.py | 4 +++- tldp/doctypes/markdown.py | 9 +++++++-- tldp/doctypes/rst.py | 9 +++++++-- tldp/doctypes/text.py | 9 +++++++-- 10 files changed, 55 insertions(+), 17 deletions(-) diff --git a/tldp/doctypes/asciidoc.py b/tldp/doctypes/asciidoc.py index 4583515..b893833 100644 --- a/tldp/doctypes/asciidoc.py +++ b/tldp/doctypes/asciidoc.py @@ -1,10 +1,13 @@ #! /usr/bin/python # -*- coding: utf8 -*- -from ..utils import logger +import logging +logger = logging.getLogger() + +from tldp.doctypes.common import BaseDoctype -class Asciidoc(object): +class Asciidoc(BaseDoctype): formatname = 'AsciiDoc' extensions = ['.txt'] signatures = [] diff --git a/tldp/doctypes/common.py b/tldp/doctypes/common.py index e1aa62d..5fc9821 100644 --- a/tldp/doctypes/common.py +++ b/tldp/doctypes/common.py @@ -7,7 +7,10 @@ import os import stat from tempfile import NamedTemporaryFile as ntf -from tldp.utils import logger, execute +import logging +logger = logging.getLogger() + +from tldp.utils import execute class SignatureChecker(object): diff --git a/tldp/doctypes/docbook4xml.py b/tldp/doctypes/docbook4xml.py index 388260c..ae240fa 100644 --- a/tldp/doctypes/docbook4xml.py +++ b/tldp/doctypes/docbook4xml.py @@ -3,7 +3,10 @@ from __future__ import absolute_import, division, print_function -from tldp.utils import logger, which, firstfoundfile +import logging +logger = logging.getLogger() + +from tldp.utils import which, firstfoundfile from tldp.utils import arg_isexecutable, isexecutable from tldp.utils import arg_isreadablefile, isreadablefile diff --git a/tldp/doctypes/docbook5xml.py b/tldp/doctypes/docbook5xml.py index de8ed79..71f52bc 100644 --- a/tldp/doctypes/docbook5xml.py +++ b/tldp/doctypes/docbook5xml.py @@ -1,11 +1,16 @@ #! /usr/bin/python # -*- coding: utf8 -*- -from ..utils import logger, which -from .common import SignatureChecker +from __future__ import absolute_import, division, print_function + +import logging +logger = logging.getLogger() + +from tldp.utils import which +from tldp.doctypes.common import BaseDoctype, SignatureChecker -class Docbook5XML(SignatureChecker): +class Docbook5XML(BaseDoctype, SignatureChecker): formatname = 'DocBook XML 5.x' extensions = ['.xml'] signatures = ['-//OASIS//DTD DocBook V5.0/EN', diff --git a/tldp/doctypes/docbooksgml.py b/tldp/doctypes/docbooksgml.py index 189eff5..606d012 100644 --- a/tldp/doctypes/docbooksgml.py +++ b/tldp/doctypes/docbooksgml.py @@ -4,8 +4,10 @@ from __future__ import absolute_import, division, print_function import os +import logging +logger = logging.getLogger() -from tldp.utils import logger, which, execute, firstfoundfile +from tldp.utils import which, execute, firstfoundfile from tldp.utils import arg_isexecutable, isexecutable from tldp.utils import arg_isreadablefile, isreadablefile diff --git a/tldp/doctypes/example.py b/tldp/doctypes/example.py index ba6c8c9..1d1fbcf 100644 --- a/tldp/doctypes/example.py +++ b/tldp/doctypes/example.py @@ -1,10 +1,15 @@ #! /usr/bin/python # -*- coding: utf8 -*- -from ..utils import logger +from __future__ import absolute_import, division, print_function + +import logging +logger = logging.getLogger() + +from tldp.doctypes.common import BaseDoctype -class Frobnitz(object): +class Frobnitz(BaseDoctype): formatname = 'Frobnitz' extensions = ['.fb'] signatures = ['{{Frobnitz-Format 2.3}}'] diff --git a/tldp/doctypes/linuxdoc.py b/tldp/doctypes/linuxdoc.py index ad17e13..b790ad8 100644 --- a/tldp/doctypes/linuxdoc.py +++ b/tldp/doctypes/linuxdoc.py @@ -4,8 +4,10 @@ from __future__ import absolute_import, division, print_function import os +import logging +logger = logging.getLogger() -from tldp.utils import logger, which, execute +from tldp.utils import which, execute from tldp.utils import arg_isexecutable, isexecutable from tldp.doctypes.common import BaseDoctype, SignatureChecker diff --git a/tldp/doctypes/markdown.py b/tldp/doctypes/markdown.py index bbe2b6c..222f5d9 100644 --- a/tldp/doctypes/markdown.py +++ b/tldp/doctypes/markdown.py @@ -1,10 +1,15 @@ #! /usr/bin/python # -*- coding: utf8 -*- -from ..utils import logger +from __future__ import absolute_import, division, print_function + +import logging +logger = logging.getLogger() + +from tldp.doctypes.common import BaseDoctype -class Markdown(object): +class Markdown(BaseDoctype): formatname = 'Markdown' extensions = ['.md'] signatures = [] diff --git a/tldp/doctypes/rst.py b/tldp/doctypes/rst.py index 990b205..e74ac5c 100644 --- a/tldp/doctypes/rst.py +++ b/tldp/doctypes/rst.py @@ -1,10 +1,15 @@ #! /usr/bin/python # -*- coding: utf8 -*- -from ..utils import logger +from __future__ import absolute_import, division, print_function + +import logging +logger = logging.getLogger() + +from tldp.doctypes.common import BaseDoctype, SignatureChecker -class RestructuredText(object): +class RestructuredText(BaseDoctype): formatname = 'reStructuredText' extensions = ['.rst'] signatures = [] diff --git a/tldp/doctypes/text.py b/tldp/doctypes/text.py index ab89352..2509b81 100644 --- a/tldp/doctypes/text.py +++ b/tldp/doctypes/text.py @@ -1,10 +1,15 @@ #! /usr/bin/python # -*- coding: utf8 -*- -from ..utils import logger +from __future__ import absolute_import, division, print_function + +import logging +logger = logging.getLogger() + +from tldp.doctypes.common import BaseDoctype -class Text(object): +class Text(BaseDoctype): formatname = 'plain text' extensions = ['.txt'] signatures = []