From 2b7e391fcd51d3468133f628f2e013574cf16536 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Sat, 9 Aug 2008 22:55:44 -0400 Subject: reorganized the extensions into a seperate dir. Much cleaner looking file system IMO. --- markdown.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'markdown.py') diff --git a/markdown.py b/markdown.py index 707b89c..38923ac 100755 --- a/markdown.py +++ b/markdown.py @@ -2135,11 +2135,14 @@ def load_extension(ext_name, configs = []): module = __import__(extension_module_name) except ImportError: - message(WARN, + try: + module = __import__('.'.join(['mdx', extension_module_name]), {}, {}, ['mdx']) + except: + message(WARN, "Couldn't load extension '%s' from \"%s\" - continuing without." % (ext_name, extension_module_name) ) - # Return a dummy (do nothing) Extension as silent failure - return Extension(configs={}) + # Return a dummy (do nothing) Extension as silent failure + return Extension(configs={}) return module.makeExtension(configs.items()) -- cgit v1.2.3 From f9bc5d2b86a94fb98e791966bb26e1abd5ef0ed2 Mon Sep 17 00:00:00 2001 From: Waylan Limberg Date: Mon, 11 Aug 2008 20:12:28 -0400 Subject: renamed extension module and set import to extension module first, then mdx_filename --- markdown.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'markdown.py') diff --git a/markdown.py b/markdown.py index 38923ac..af611c8 100755 --- a/markdown.py +++ b/markdown.py @@ -2129,18 +2129,20 @@ def load_extension(ext_name, configs = []): pairs = [x.split("=") for x in ext_args.split(",")] configs.update([(x.strip(), y.strip()) for (x, y) in pairs]) - extension_module_name = "mdx_" + ext_name + ext_module = 'markdown_extensions' + module_name = '.'.join([ext_module, ext_name]) + extension_module_name = '_'.join(['mdx', ext_name]) try: - module = __import__(extension_module_name) - + module = __import__(module_name, {}, {}, [ext_module]) except ImportError: try: - module = __import__('.'.join(['mdx', extension_module_name]), {}, {}, ['mdx']) + module = __import__(extension_module_name) except: message(WARN, - "Couldn't load extension '%s' from \"%s\" - continuing without." - % (ext_name, extension_module_name) ) + "Failed loading extension '%s' from '%s' or '%s' " + "- continuing without." + % (ext_name, module_name, extension_module_name) ) # Return a dummy (do nothing) Extension as silent failure return Extension(configs={}) -- cgit v1.2.3