aboutsummaryrefslogtreecommitdiffstats
path: root/markdown
diff options
context:
space:
mode:
authorWaylan Limberg <waylan.limberg@icloud.com>2014-08-27 15:38:46 -0400
committerWaylan Limberg <waylan.limberg@icloud.com>2014-08-27 15:38:46 -0400
commit050c9af032a9147f9072b81eb93cbf16ebcad5c1 (patch)
treefb1f8218006cba3a016c03e255f56ab25564c6e5 /markdown
parent07df8ccbe76cb37b5b872d0a9719ee4544aad79e (diff)
parent0b5e08c8816116e6de0d71a56c2867b165896065 (diff)
downloadmarkdown-050c9af032a9147f9072b81eb93cbf16ebcad5c1.tar.gz
markdown-050c9af032a9147f9072b81eb93cbf16ebcad5c1.tar.bz2
markdown-050c9af032a9147f9072b81eb93cbf16ebcad5c1.zip
Merge branch 'master' of https://github.com/waylan/Python-Markdown
Diffstat (limited to 'markdown')
-rw-r--r--markdown/__main__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/markdown/__main__.py b/markdown/__main__.py
index 60706b1..8dd8d38 100644
--- a/markdown/__main__.py
+++ b/markdown/__main__.py
@@ -78,7 +78,7 @@ def parse_options(args=None, values=None):
with codecs.open(options.configfile, mode="r", encoding=options.encoding) as fp:
try:
extension_configs = yaml.load(fp)
- except yaml.YAMLError as e:
+ except Exception as e:
message = "Failed parsing extension config file: %s" % options.configfile
e.args = (message,) + e.args[1:]
raise