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

@@ -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 = []

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):

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
 

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',

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
 

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}}']

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
 

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 = []

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 = []

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 = []