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)
This commit is contained in:
Martin A. Brown 2016-02-25 11:37:14 -08:00
parent b86f92f742
commit e74197eb01
10 changed files with 55 additions and 17 deletions

View File

@ -1,10 +1,13 @@
#! /usr/bin/python #! /usr/bin/python
# -*- coding: utf8 -*- # -*- 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' formatname = 'AsciiDoc'
extensions = ['.txt'] extensions = ['.txt']
signatures = [] signatures = []

View File

@ -7,7 +7,10 @@ import os
import stat import stat
from tempfile import NamedTemporaryFile as ntf 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): class SignatureChecker(object):

View File

@ -3,7 +3,10 @@
from __future__ import absolute_import, division, print_function 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_isexecutable, isexecutable
from tldp.utils import arg_isreadablefile, isreadablefile from tldp.utils import arg_isreadablefile, isreadablefile

View File

@ -1,11 +1,16 @@
#! /usr/bin/python #! /usr/bin/python
# -*- coding: utf8 -*- # -*- coding: utf8 -*-
from ..utils import logger, which from __future__ import absolute_import, division, print_function
from .common import SignatureChecker
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' formatname = 'DocBook XML 5.x'
extensions = ['.xml'] extensions = ['.xml']
signatures = ['-//OASIS//DTD DocBook V5.0/EN', signatures = ['-//OASIS//DTD DocBook V5.0/EN',

View File

@ -4,8 +4,10 @@
from __future__ import absolute_import, division, print_function from __future__ import absolute_import, division, print_function
import os 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_isexecutable, isexecutable
from tldp.utils import arg_isreadablefile, isreadablefile from tldp.utils import arg_isreadablefile, isreadablefile

View File

@ -1,10 +1,15 @@
#! /usr/bin/python #! /usr/bin/python
# -*- coding: utf8 -*- # -*- 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' formatname = 'Frobnitz'
extensions = ['.fb'] extensions = ['.fb']
signatures = ['{{Frobnitz-Format 2.3}}'] signatures = ['{{Frobnitz-Format 2.3}}']

View File

@ -4,8 +4,10 @@
from __future__ import absolute_import, division, print_function from __future__ import absolute_import, division, print_function
import os 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.utils import arg_isexecutable, isexecutable
from tldp.doctypes.common import BaseDoctype, SignatureChecker from tldp.doctypes.common import BaseDoctype, SignatureChecker

View File

@ -1,10 +1,15 @@
#! /usr/bin/python #! /usr/bin/python
# -*- coding: utf8 -*- # -*- 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' formatname = 'Markdown'
extensions = ['.md'] extensions = ['.md']
signatures = [] signatures = []

View File

@ -1,10 +1,15 @@
#! /usr/bin/python #! /usr/bin/python
# -*- coding: utf8 -*- # -*- 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' formatname = 'reStructuredText'
extensions = ['.rst'] extensions = ['.rst']
signatures = [] signatures = []

View File

@ -1,10 +1,15 @@
#! /usr/bin/python #! /usr/bin/python
# -*- coding: utf8 -*- # -*- 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' formatname = 'plain text'
extensions = ['.txt'] extensions = ['.txt']
signatures = [] signatures = []