Browse Source

Used the new to_dict method in expando

main
Lakshmi Vyasarajan 14 years ago
parent
commit
f767b5b794
1 changed files with 7 additions and 2 deletions
  1. +7
    -2
      hyde/ext/templates/jinja.py

+ 7
- 2
hyde/ext/templates/jinja.py View File

@@ -4,6 +4,7 @@ Jinja template utilties
""" """


from hyde.fs import File, Folder from hyde.fs import File, Folder
from hyde.model import Expando
from hyde.template import HtmlWrap, Template from hyde.template import HtmlWrap, Template
from hyde.site import Resource from hyde.site import Resource
from hyde.util import getLoggerWithNullHandler, getLoggerWithConsoleHandler from hyde.util import getLoggerWithNullHandler, getLoggerWithConsoleHandler
@@ -58,7 +59,9 @@ def markdown(env, value):
d = {} d = {}
if hasattr(env.config, 'markdown'): if hasattr(env.config, 'markdown'):
d['extensions'] = getattr(env.config.markdown, 'extensions', []) d['extensions'] = getattr(env.config.markdown, 'extensions', [])
d['extension_configs'] = getattr(env.config.markdown, 'extension_configs', {})
d['extension_configs'] = getattr(env.config.markdown,
'extension_configs',
Expando({})).to_dict()
md = markdown.Markdown(**d) md = markdown.Markdown(**d)
return md.convert(output) return md.convert(output)


@@ -80,7 +83,9 @@ def syntax(env, value, lexer=None, filename=None):
lexers.guess_lexer(value)) lexers.guess_lexer(value))
settings = {} settings = {}
if hasattr(env.config, 'syntax'): if hasattr(env.config, 'syntax'):
settings = dict(getattr(env.config.syntax, 'options', {}))
settings = getattr(env.config.syntax,
'options',
Expando({})).to_dict()


formatter = formatters.HtmlFormatter(**settings) formatter = formatters.HtmlFormatter(**settings)
code = pygments.highlight(value, pyg, formatter) code = pygments.highlight(value, pyg, formatter)


Loading…
Cancel
Save