aboutsummaryrefslogtreecommitdiffstats
path: root/markdown
diff options
context:
space:
mode:
Diffstat (limited to 'markdown')
-rw-r--r--markdown/__init__.py8
-rw-r--r--markdown/commandline.py5
-rw-r--r--markdown/etree_loader.py3
3 files changed, 8 insertions, 8 deletions
diff --git a/markdown/__init__.py b/markdown/__init__.py
index 38ab9fb..8a473b1 100644
--- a/markdown/__init__.py
+++ b/markdown/__init__.py
@@ -47,6 +47,10 @@ import codecs
import logging
from logging import DEBUG, INFO, WARN, ERROR, CRITICAL
+def message(level, text):
+ """ A wrapper method for logging debug messages. """
+ logging.getLogger('MARKDOWN').log(level, text)
+
"""
CONSTANTS
=============================================================================
@@ -108,9 +112,7 @@ AUXILIARY GLOBAL FUNCTIONS
=============================================================================
"""
-def message(level, text):
- """ A wrapper method for logging debug messages. """
- logging.getLogger('MARKDOWN').log(level, text)
+
def isBlockLevel(tag):
diff --git a/markdown/commandline.py b/markdown/commandline.py
index 9b1a1bf..68efcdb 100644
--- a/markdown/commandline.py
+++ b/markdown/commandline.py
@@ -83,11 +83,6 @@ def parse_options():
def run():
"""Run Markdown from the command line."""
- # Setup a logger manually for compatibility with Python 2.3
- logger = logging.getLogger('MARKDOWN')
- logger.setLevel(markdown.COMMAND_LINE_LOGGING_LEVEL)
- logger.addHandler(logging.StreamHandler())
-
# Parse options and adjust logging level if necessary
options, logging_level = parse_options()
if not options: sys.exit(0)
diff --git a/markdown/etree_loader.py b/markdown/etree_loader.py
index 88914be..e2599b2 100644
--- a/markdown/etree_loader.py
+++ b/markdown/etree_loader.py
@@ -1,4 +1,7 @@
+from markdown import message, CRITICAL
+import sys
+
## Import
def importETree():
"""Import the best implementation of ElementTree, return a module object."""