From bf0b7a1cb754695264101ae9ccfafbe88bdede81 Mon Sep 17 00:00:00 2001 From: Cas Rusnov Date: Mon, 3 Jun 2019 19:23:34 -0700 Subject: [PATCH] Comment out smart CSS from default mapping. Fix minor bug in template_tools --- pixywerk2/defaults/chains.yaml | 34 +++++++++++++++++----------------- pixywerk2/template_tools.py | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pixywerk2/defaults/chains.yaml b/pixywerk2/defaults/chains.yaml index 4683860..18bb72e 100644 --- a/pixywerk2/defaults/chains.yaml +++ b/pixywerk2/defaults/chains.yaml @@ -62,24 +62,24 @@ template-html: - jinja2 - jinja2_page_embed -# Smart CSS are simply converted to CSS. -sass: - extension: - - sass - - scss - chain: - - process_sass -less: - extension: - - less - chain: - - process_less +# # Smart CSS are simply converted to CSS. +# sass: +# extension: +# - sass +# - scss +# chain: +# - process_sass +# less: +# extension: +# - less +# chain: +# - process_less -stylus: - extension: - - styl - chain: - - process_styl +# stylus: +# extension: +# - styl +# chain: +# - process_styl # # Images are processed into thumbnails and sized in addition to being retained as their original # FIXME implement split chain processor, implement processor arguments, diff --git a/pixywerk2/template_tools.py b/pixywerk2/template_tools.py index 28e4249..058fb76 100644 --- a/pixywerk2/template_tools.py +++ b/pixywerk2/template_tools.py @@ -67,7 +67,7 @@ def file_content(root: str, metatree: MetaTree, processor_chains: ProcessorChain metadata = metatree.get_metadata(file_name) chain = processor_chains.get_chain_for_filename(os.path.join(root, file_name), ctx=metadata) contcache[file_name] = chain.output - return unicode(chain.output) + return str(chain.output) return get_file_content