Break cyclic import of markdown. This allows people to embed markdown

if they desire.

1 files changed, 17 insertions, 15 deletions

diff --git a/markdown/treeprocessors.py b/markdown/treeprocessors.py
index 97073f4..79c3999 100644
--- a/markdown/treeprocessors.py
+++ b/markdown/treeprocessors.py
@@ -1,6 +1,8 @@
-import markdown
 import re
 
+import inlinepatterns
+import misc
+
 def isString(s):
     """ Check if it's string """
     return isinstance(s, unicode) or isinstance(s, str)
@@ -37,17 +39,17 @@ class InlineProcessor(Treeprocessor):
     """
 
     def __init__ (self, md):
-        self.__placeholder_prefix = markdown.INLINE_PLACEHOLDER_PREFIX
-        self.__placeholder_suffix = markdown.ETX
+        self.__placeholder_prefix = misc.INLINE_PLACEHOLDER_PREFIX
+        self.__placeholder_suffix = misc.ETX
         self.__placeholder_length = 4 + len(self.__placeholder_prefix) \
                                       + len(self.__placeholder_suffix)
-        self.__placeholder_re = re.compile(markdown.INLINE_PLACEHOLDER % r'([0-9]{4})')
+        self.__placeholder_re = re.compile(misc.INLINE_PLACEHOLDER % r'([0-9]{4})')
         self.markdown = md
 
     def __makePlaceholder(self, type):
         """ Generate a placeholder """
         id = "%04d" % len(self.stashed_nodes)
-        hash = markdown.INLINE_PLACEHOLDER % id
+        hash = misc.INLINE_PLACEHOLDER % id
         return hash, id
 
     def __findPlaceholder(self, data, index):
@@ -87,7 +89,7 @@ class InlineProcessor(Treeprocessor):
         Returns: String with placeholders.
 
         """
-        if not isinstance(data, markdown.AtomicString):
+        if not isinstance(data, misc.AtomicString):
             startIndex = 0
             while patternIndex < len(self.markdown.inlinePatterns):
                 data, matched, startIndex = self.__applyPattern(
@@ -222,7 +224,7 @@ class InlineProcessor(Treeprocessor):
             return data, True, len(leftData) + match.span(len(match.groups()))[0]
 
         if not isString(node):
-            if not isinstance(node.text, markdown.AtomicString):
+            if not isinstance(node.text, misc.AtomicString):
                 # We need to process current node too
                 for child in [node] + node.getchildren():
                     if not isString(node):
@@ -264,7 +266,7 @@ class InlineProcessor(Treeprocessor):
             currElement = stack.pop()
             insertQueue = []
             for child in currElement.getchildren():
-                if child.text and not isinstance(child.text, markdown.AtomicString):
+                if child.text and not isinstance(child.text, misc.AtomicString):
                     text = child.text
                     child.text = None
                     lst = self.__processPlaceholders(self.__handleInline(
@@ -275,22 +277,22 @@ class InlineProcessor(Treeprocessor):
                 if child.getchildren():
                     stack.append(child)
 
-            if markdown.ENABLE_ATTRIBUTES:
+            if misc.ENABLE_ATTRIBUTES:
                 for element, lst in insertQueue:
                     if element.text:
                         element.text = \
-                            markdown.inlinepatterns.handleAttributes(element.text, 
+                            inlinepatterns.handleAttributes(element.text, 
                                                                      element)
                     i = 0
                     for newChild in lst:
                         # Processing attributes
                         if newChild.tail:
                             newChild.tail = \
-                                markdown.inlinepatterns.handleAttributes(newChild.tail,
+                                inlinepatterns.handleAttributes(newChild.tail,
                                                                          element)
                         if newChild.text:
                             newChild.text = \
-                                markdown.inlinepatterns.handleAttributes(newChild.text,
+                                inlinepatterns.handleAttributes(newChild.text,
                                                                          newChild)
                         element.insert(i, newChild)
                         i += 1
@@ -304,12 +306,12 @@ class PrettifyTreeprocessor(Treeprocessor):
         """ Recursively add linebreaks to ElementTree children. """
 
         i = "\n"
-        if markdown.isBlockLevel(elem.tag) and elem.tag not in ['code', 'pre']:
+        if misc.isBlockLevel(elem.tag) and elem.tag not in ['code', 'pre']:
             if (not elem.text or not elem.text.strip()) \
-                    and len(elem) and markdown.isBlockLevel(elem[0].tag):
+                    and len(elem) and misc.isBlockLevel(elem[0].tag):
                 elem.text = i
             for e in elem:
-                if markdown.isBlockLevel(e.tag):
+                if misc.isBlockLevel(e.tag):
                     self._prettifyETree(e)
             if not elem.tail or not elem.tail.strip():
                 elem.tail = i