[Python-modules-commits] [python-kajiki] 02/05: Merge tag 'upstream/0.6.1'

[Takaki Taniguchi]

This is an automated email from the git hooks/post-receive script.

takaki pushed a commit to branch master
in repository python-kajiki.

commit 99ad40b1bb3bd8570a98c27e471adcfd0aefd370
Merge: 39a9a4a 886a931
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Thu Feb 2 18:16:04 2017 +0900

    Merge tag 'upstream/0.6.1'
    
    Upstream version 0.6.1
    
    # gpg: Signature made 2017年02月02日 18時16分04秒 JST
    # gpg:                using RSA key D24ABFD127CD2556A13C6C79CC149F6C28A5E257
    # gpg:                issuer "takaki at asis.media-as.org"
    # gpg: Good signature from "TANIGUCHI Takaki <takaki at media-as.org>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at asis.media-as.org>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <taniguchi.takaki at gmail.com>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at debian.org>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at debian.or.jp>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at takaki.media-as.org>" [ultimate]
    # gpg:                 aka "TANIGUCHI Takaki <takaki at nagoya-u.jp>" [ultimate]

 CHANGES.rst                  |  18 +++
 Kajiki.egg-info/PKG-INFO     |  20 ++-
 Kajiki.egg-info/SOURCES.txt  |   1 +
 PKG-INFO                     |  20 ++-
 docs/conf.py                 |   2 +-
 docs/runtime.rst             |  28 +++-
 kajiki/doctype.py            |  50 ++++++-
 kajiki/html_utils.py         |  17 +--
 kajiki/i18n.py               |  10 +-
 kajiki/ir.py                 |  11 +-
 kajiki/loader.py             |  13 +-
 kajiki/template.py           |  66 +++++++--
 kajiki/tests/data/error.html |   6 +
 kajiki/tests/test_ir.py      |   0
 kajiki/tests/test_runtime.py |   0
 kajiki/tests/test_text.py    |   6 +
 kajiki/tests/test_xml.py     | 144 +++++++++++++++----
 kajiki/text.py               |   4 +-
 kajiki/util.py               |   2 +-
 kajiki/version.py            |   4 +-
 kajiki/xml_template.py       | 325 +++++++++++++++++++++++++++++++++----------
 21 files changed, 593 insertions(+), 154 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-kajiki.git