diff options
| -rw-r--r-- | MANIFEST | 20 | ||||
| -rwxr-xr-x | markdown.py | 14 | ||||
| -rw-r--r-- | markdown_extensions/__init__.py (renamed from mdx/__init__.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/codehilite.py (renamed from mdx/mdx_codehilite.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/extra.py (renamed from mdx/mdx_extra.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/fenced_code.py (renamed from mdx/mdx_fenced_code.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/footnotes.py (renamed from mdx/mdx_footnotes.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/headerid.py (renamed from mdx/mdx_headerid.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/imagelinks.py (renamed from mdx/mdx_imagelinks.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/meta.py (renamed from mdx/mdx_meta.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/rss.py (renamed from mdx/mdx_rss.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/tables.py (renamed from mdx/mdx_tables.py) | 0 | ||||
| -rw-r--r-- | markdown_extensions/wikilink.py (renamed from mdx/mdx_wikilink.py) | 0 | ||||
| -rw-r--r-- | setup.py | 2 |
14 files changed, 19 insertions, 17 deletions
@@ -1,14 +1,14 @@ markdown.py -mdx/__init__.py -mdx/mdx_codehilite.py -mdx/mdx_fenced_code.py -mdx/mdx_footnotes.py -mdx/mdx_headerid.py -mdx/mdx_imagelinks.py -mdx/mdx_meta.py -mdx/mdx_rss.py -mdx/mdx_tables.py -mdx/mdx_wikilink.py +markdown_extnesions/__init__.py +markdown_extensions/codehilite.py +markdown_extensions/fenced_code.py +markdown_extensions/footnotes.py +markdown_extensions/headerid.py +markdown_extensions/imagelinks.py +markdown_extensions/meta.py +markdown_extensions/rss.py +markdown_extensions/tables.py +markdown_extensions/wikilink.py setup.py scripts/pymarkdown.py docs/README 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={}) diff --git a/mdx/__init__.py b/markdown_extensions/__init__.py index e69de29..e69de29 100644 --- a/mdx/__init__.py +++ b/markdown_extensions/__init__.py diff --git a/mdx/mdx_codehilite.py b/markdown_extensions/codehilite.py index 73c1a79..73c1a79 100644 --- a/mdx/mdx_codehilite.py +++ b/markdown_extensions/codehilite.py diff --git a/mdx/mdx_extra.py b/markdown_extensions/extra.py index e99bec4..e99bec4 100644 --- a/mdx/mdx_extra.py +++ b/markdown_extensions/extra.py diff --git a/mdx/mdx_fenced_code.py b/markdown_extensions/fenced_code.py index c3d9f7f..c3d9f7f 100644 --- a/mdx/mdx_fenced_code.py +++ b/markdown_extensions/fenced_code.py diff --git a/mdx/mdx_footnotes.py b/markdown_extensions/footnotes.py index b46efbb..b46efbb 100644 --- a/mdx/mdx_footnotes.py +++ b/markdown_extensions/footnotes.py diff --git a/mdx/mdx_headerid.py b/markdown_extensions/headerid.py index 8947338..8947338 100644 --- a/mdx/mdx_headerid.py +++ b/markdown_extensions/headerid.py diff --git a/mdx/mdx_imagelinks.py b/markdown_extensions/imagelinks.py index e545b24..e545b24 100644 --- a/mdx/mdx_imagelinks.py +++ b/markdown_extensions/imagelinks.py diff --git a/mdx/mdx_meta.py b/markdown_extensions/meta.py index 30dea8a..30dea8a 100644 --- a/mdx/mdx_meta.py +++ b/markdown_extensions/meta.py diff --git a/mdx/mdx_rss.py b/markdown_extensions/rss.py index b88b9b5..b88b9b5 100644 --- a/mdx/mdx_rss.py +++ b/markdown_extensions/rss.py diff --git a/mdx/mdx_tables.py b/markdown_extensions/tables.py index 829044c..829044c 100644 --- a/mdx/mdx_tables.py +++ b/markdown_extensions/tables.py diff --git a/mdx/mdx_wikilink.py b/markdown_extensions/wikilink.py index 47037a6..47037a6 100644 --- a/mdx/mdx_wikilink.py +++ b/markdown_extensions/wikilink.py @@ -11,6 +11,6 @@ setup( url = "http://www.freewisdom.org/projects/python-markdown", license = "BSD License, GNU Public License (GPL)", py_modules = ["markdown"], - packages = ['mdx'], + packages = ['markdown_extensions'], scripts = ['scripts/pymarkdown.py'], ) |