# HG changeset patch
# User Constantine Linnick <theaspect@gmail.com>
# Date 1381167098 -25200
# Node ID ea6a7cfcacd8641b107ea3a58ef6f262b1b80909
# Parent  5a8c3dda25ee136355fd54ea959fbb6350ee160f# Parent  61b435d176462fc5aa556e05cb9ece1b94176eaf
Merged celdredge/hgext.markdown into default

diff -r 5a8c3dda25ee -r ea6a7cfcacd8 __init__.py
--- a/__init__.py	Tue Oct 08 00:02:43 2013 +0700
+++ b/__init__.py	Tue Oct 08 00:31:38 2013 +0700
@@ -196,11 +196,13 @@
 
     try:
         from markdown import Markdown
-        global Markdown
     except ImportError:
         dir = os.path.dirname(os.path.realpath(__file__))
         md = ui.config("web", "markdown.egg", "Markdown-2.3.1")
         ui.debug("Markdown not found search for egg in local dir %s for %s.zip\n" % (dir, md))
         sys.path.append(os.path.join(dir, "%s.zip\%s" % (md, md)))
-        from markdown import Markdown
-        global Markdown
+        try:
+            from markdown import Markdown
+        except ImportError:
+            ui.error("Unable to locate markdown in path %s" % sys.path)
+    global Markdown