Merge recent changes from the master branch into element_parser branch #147
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Whitespace after key name in attribute syntax throws an exception
…_fix Fix for two failing tests
…that use "macro" and "call"
Command line options for hamlpy-watcher
Add a new line after the closing conditional comment
Changed 'athelete' to 'athlete'.
…ting to Django settings
--attr-wrapper option for command line and HAMLPY_ATTR_WRAPPER setting for Django
added jinja2 extension
Fix for watcher options that broke in pull request jessemiller#106
Fix jessemiller#114 HamlPyExtension filename extension check invalid
…o Naddiseo-jinja_compat Conflicts: hamlpy/hamlpy_watcher.py
Documented :stylus, :coffeescript; fixed documentation for :css
Updated reference.md (:stylus, :coffeescript, :css)
* addresses Issue jessemiller#132 * include dependent functionality only if the required package is available * duplicate TemplateDoesNotExist() if django is not present * add `NotAvailableError` for nodes which depend on non-present packages * move pygments_filter test into template tests * fix test for Pygments version 1.6
Output local time instead of gmttime in hamlpy_watcher when in verbose mode
Remove strict dependencies on django, pygments, markdown, jinja2
…ttributes Allow attributes to contain any letter at all (not just ascii)
make the test of non-ascii filenames actually pass, by marking strings as unicode I missed the note about how to run the unit tests when submitting this patch, and it turns out the test actually failed. Just needed to mark the appropriate strings as unicode to get it to work.
Fix Markdown br bug Thanks to @boscoh for the following: In the `:markdown` filter, the markdown for implicit `<br>` tag is broken. The reason is that markdown recognises a line with `<br>` by two trailing spaces. However, trailing spaces are stripped when `PlaintextNode.haml` is read. To fix: when the text is reconstructed to send to the Markdown filter, instead of using the `PlaintextNode.haml` field, `PlaintextNode.raw_haml.lstrip()` is used, which keeps the trailing spaces.
Update reference.md
- Added missing Jinja2 tag `raw`
Fix to templatize decorator so it only hamlpy parses files with valid haml extensions see Issue jessemiller#96
|
Hello, As this repository sadly doesn't seems to be maintained anymore (it's been 3 years now), I've forked it, integrated this patch and upload it on pypi under I'm looking for a third co-maintainer (to avoid having an unmaintained project again), ideally someone that wishes to use it with the jinja2 part of django but that's not mandatory. @jessemiller if you ever come back to hamlpy feel free to join :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.