From d2bb675211be2470a34cb62e36016c5171e6a20a Mon Sep 17 00:00:00 2001 From: Craig de Stigter Date: Mon, 18 Apr 2011 16:55:59 +1200 Subject: fix import loop when importing logger --- markdown/__init__.py | 3 +-- markdown/blockprocessors.py | 4 +++- markdown/commandline.py | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/markdown/__init__.py b/markdown/__init__.py index b397f1b..0ca0509 100644 --- a/markdown/__init__.py +++ b/markdown/__init__.py @@ -48,8 +48,7 @@ import html4 # For backwards compatibility in the 2.0.x series # The things defined in these modules started off in __init__.py so third # party code might need to access them here. -#from util import * - +from util import * logger = logging.getLogger('MARKDOWN') diff --git a/markdown/blockprocessors.py b/markdown/blockprocessors.py index 10a0177..2f15578 100644 --- a/markdown/blockprocessors.py +++ b/markdown/blockprocessors.py @@ -12,10 +12,12 @@ as they need to alter how markdown blocks are parsed. """ +import logging import re import util from blockparser import BlockParser -from markdown import logger + +logger = logging.getLogger('MARKDOWN') def build_block_parser(md_instance, **kwargs): diff --git a/markdown/commandline.py b/markdown/commandline.py index eab23bb..3f2e009 100644 --- a/markdown/commandline.py +++ b/markdown/commandline.py @@ -7,9 +7,11 @@ COMMAND-LINE SPECIFIC STUFF import markdown import sys import optparse + +import logging from logging import DEBUG, INFO, CRITICAL -from markdown import logger +logger = logging.getLogger('MARKDOWN') # default logging level for command-line use COMMAND_LINE_LOGGING_LEVEL = CRITICAL -- cgit v1.2.3