diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2017-05-17 23:16:59 +0000 |
|---|---|---|
| committer | Michael Bayer <classic@zzzcomputing.com> | 2017-05-17 23:16:59 +0000 |
| commit | d88e62cb24124d7ce7b1305b79d6a8d6574df80e (patch) | |
| tree | 5ba6c10407724176f7764771f42bb5da275e530f | |
| parent | 26f89c9baeceed65b30baf14e74bad19408693b9 (diff) | |
| parent | 317d300f6fe7e9fd56f7a84d29349f852f6d3e17 (diff) | |
| download | mako-d88e62cb24124d7ce7b1305b79d6a8d6574df80e.tar.gz | |
Merged in scop/mako/spelling (pull request #25)
Spelling fixes
| -rw-r--r-- | doc/build/changelog.rst | 2 | ||||
| -rw-r--r-- | doc/build/namespaces.rst | 2 | ||||
| -rw-r--r-- | mako/_ast_util.py | 2 | ||||
| -rw-r--r-- | mako/ext/extract.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst index 7d110f3..6a929fd 100644 --- a/doc/build/changelog.rst +++ b/doc/build/changelog.rst @@ -1570,7 +1570,7 @@ Older Versions :tags: bugfixes :tickets: 69 - fixed codegen bug which occured when using <%page> + fixed codegen bug which occurred when using <%page> level caching, combined with an expression-based cache_key, combined with the usage of <%namespace import="*"/> - fixed lexer exceptions not cleaning up diff --git a/doc/build/namespaces.rst b/doc/build/namespaces.rst index 1453b80..afd323d 100644 --- a/doc/build/namespaces.rst +++ b/doc/build/namespaces.rst @@ -399,7 +399,7 @@ in the ``<%! %>`` of a template. Above, the file ``library.mako`` declares an attribute ``includes`` inside its global ``<%! %>`` section. -``index.mako`` includes this template using the ``<%namespace>`` tag. The base template ``base.mako``, which is the inherited parent of ``index.mako`` and is reponsible for layout, then locates this attribute and iterates through its contents to produce the includes that are specific to ``library.mako``. +``index.mako`` includes this template using the ``<%namespace>`` tag. The base template ``base.mako``, which is the inherited parent of ``index.mako`` and is responsible for layout, then locates this attribute and iterates through its contents to produce the includes that are specific to ``library.mako``. Version Two - Use a specific named def ----------------------------------------- diff --git a/mako/_ast_util.py b/mako/_ast_util.py index 8d19b0d..c410287 100644 --- a/mako/_ast_util.py +++ b/mako/_ast_util.py @@ -187,7 +187,7 @@ def iter_fields(node): def get_fields(node): - """Like `iter_fiels` but returns a dict.""" + """Like `iter_fields` but returns a dict.""" return dict(iter_fields(node)) diff --git a/mako/ext/extract.py b/mako/ext/extract.py index 8dd2e96..d777ea8 100644 --- a/mako/ext/extract.py +++ b/mako/ext/extract.py @@ -68,7 +68,7 @@ class MessageExtractor(object): else: continue - # Comments don't apply unless they immediately preceed the message + # Comments don't apply unless they immediately precede the message if translator_comments and \ translator_comments[-1][0] < node.lineno - 1: translator_comments = [] |