[Python-modules-commits] [mako] 01/06: Import mako_1.0.7+ds1.orig.tar.gz
Piotr Ożarowski
piotr at moszumanska.debian.org
Fri Jul 14 14:50:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
piotr pushed a commit to branch master
in repository mako.
commit 5dbb4829834600621bfc7e8f9aaf89df6f967f88
Author: Piotr Ożarowski <piotr at debian.org>
Date: Fri Jul 14 16:43:15 2017 +0200
Import mako_1.0.7+ds1.orig.tar.gz
---
AUTHORS | 13 +++++++++++++
MANIFEST.in | 2 +-
PKG-INFO | 2 +-
doc/_sources/{caching.txt => caching.rst.txt} | 0
doc/_sources/{changelog.txt => changelog.rst.txt} | 14 +++++++++++++-
doc/_sources/{defs.txt => defs.rst.txt} | 0
doc/_sources/{filtering.txt => filtering.rst.txt} | 0
doc/_sources/{index.txt => index.rst.txt} | 0
doc/_sources/{inheritance.txt => inheritance.rst.txt} | 0
doc/_sources/{namespaces.txt => namespaces.rst.txt} | 2 +-
doc/_sources/{runtime.txt => runtime.rst.txt} | 0
doc/_sources/{syntax.txt => syntax.rst.txt} | 0
doc/_sources/{unicode.txt => unicode.rst.txt} | 0
doc/_sources/{usage.txt => usage.rst.txt} | 0
doc/build/changelog.rst | 14 +++++++++++++-
doc/build/conf.py | 4 ++--
doc/build/namespaces.rst | 2 +-
doc/build/templates/genindex.mako | 4 ++--
mako/__init__.py | 2 +-
mako/_ast_util.py | 2 +-
mako/cache.py | 14 +++++++-------
mako/cmd.py | 2 +-
mako/ext/extract.py | 2 +-
mako/parsetree.py | 2 +-
mako/template.py | 2 +-
setup.cfg | 1 -
test/test_exceptions.py | 4 ++--
27 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..81d16dc
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,13 @@
+Mako was created by Michael Bayer.
+
+Major contributing authors include:
+
+- Michael Bayer <mike_mp at zzzcomputing.com>
+- Geoffrey T. Dairiki <dairiki at dairiki.org>
+- Philip Jenvey <pjenvey at underboss.org>
+- David Peckam
+- Armin Ronacher
+- Ben Bangert <ben at groovie.org>
+- Ben Trofatter
+
+
diff --git a/MANIFEST.in b/MANIFEST.in
index f6e0a5b..452a408 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,7 +5,7 @@ recursive-include doc *.html *.css *.txt *.js *.png *.py Makefile *.rst *.mako
recursive-include examples *.py *.xml *.mako *.myt *.kid *.tmpl
recursive-include test *.py *.html *.mako
-include README* LICENSE distribute_setup.py ez_setup.py CHANGES*
+include README* AUTHORS LICENSE distribute_setup.py ez_setup.py CHANGES*
prune doc/build/output
diff --git a/PKG-INFO b/PKG-INFO
index 3122d63..f7b87d1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: Mako
-Version: 1.0.6
+Version: 1.0.7
Summary: A super-fast templating language that borrows the best ideas from the existing templating languages.
Home-page: http://www.makotemplates.org/
Author: Mike Bayer
diff --git a/doc/_sources/caching.txt b/doc/_sources/caching.rst.txt
similarity index 100%
rename from doc/_sources/caching.txt
rename to doc/_sources/caching.rst.txt
diff --git a/doc/_sources/changelog.txt b/doc/_sources/changelog.rst.txt
similarity index 99%
rename from doc/_sources/changelog.txt
rename to doc/_sources/changelog.rst.txt
index 7d110f3..1b7c51b 100644
--- a/doc/_sources/changelog.txt
+++ b/doc/_sources/changelog.rst.txt
@@ -6,6 +6,18 @@ Changelog
===
.. changelog::
+ :version: 1.0.7
+ :released: Thu Jul 13 2017
+
+ .. change::
+ :tags: bug
+
+ Changed the "print" in the mako-render command to
+ sys.stdout.write(), avoiding the extra newline at the end
+ of the template output. Pull request courtesy
+ Yves Chevallier.
+
+.. changelog::
:version: 1.0.6
:released: Wed Nov 9 2016
@@ -1570,7 +1582,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/_sources/defs.txt b/doc/_sources/defs.rst.txt
similarity index 100%
rename from doc/_sources/defs.txt
rename to doc/_sources/defs.rst.txt
diff --git a/doc/_sources/filtering.txt b/doc/_sources/filtering.rst.txt
similarity index 100%
rename from doc/_sources/filtering.txt
rename to doc/_sources/filtering.rst.txt
diff --git a/doc/_sources/index.txt b/doc/_sources/index.rst.txt
similarity index 100%
rename from doc/_sources/index.txt
rename to doc/_sources/index.rst.txt
diff --git a/doc/_sources/inheritance.txt b/doc/_sources/inheritance.rst.txt
similarity index 100%
rename from doc/_sources/inheritance.txt
rename to doc/_sources/inheritance.rst.txt
diff --git a/doc/_sources/namespaces.txt b/doc/_sources/namespaces.rst.txt
similarity index 98%
rename from doc/_sources/namespaces.txt
rename to doc/_sources/namespaces.rst.txt
index 1453b80..afd323d 100644
--- a/doc/_sources/namespaces.txt
+++ b/doc/_sources/namespaces.rst.txt
@@ -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/doc/_sources/runtime.txt b/doc/_sources/runtime.rst.txt
similarity index 100%
rename from doc/_sources/runtime.txt
rename to doc/_sources/runtime.rst.txt
diff --git a/doc/_sources/syntax.txt b/doc/_sources/syntax.rst.txt
similarity index 100%
rename from doc/_sources/syntax.txt
rename to doc/_sources/syntax.rst.txt
diff --git a/doc/_sources/unicode.txt b/doc/_sources/unicode.rst.txt
similarity index 100%
rename from doc/_sources/unicode.txt
rename to doc/_sources/unicode.rst.txt
diff --git a/doc/_sources/usage.txt b/doc/_sources/usage.rst.txt
similarity index 100%
rename from doc/_sources/usage.txt
rename to doc/_sources/usage.rst.txt
diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index 7d110f3..1b7c51b 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -6,6 +6,18 @@ Changelog
===
.. changelog::
+ :version: 1.0.7
+ :released: Thu Jul 13 2017
+
+ .. change::
+ :tags: bug
+
+ Changed the "print" in the mako-render command to
+ sys.stdout.write(), avoiding the extra newline at the end
+ of the template output. Pull request courtesy
+ Yves Chevallier.
+
+.. changelog::
:version: 1.0.6
:released: Wed Nov 9 2016
@@ -1570,7 +1582,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/conf.py b/doc/build/conf.py
index 807782b..605af5a 100644
--- a/doc/build/conf.py
+++ b/doc/build/conf.py
@@ -208,8 +208,8 @@ htmlhelp_basename = 'Makodoc'
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
- ('index', 'mako_%s.tex' % release.replace('.', '_'), ur'Mako Documentation',
- ur'Mike Bayer', 'manual'),
+ ('index', 'mako_%s.tex' % release.replace('.', '_'), u'Mako Documentation',
+ u'Mike Bayer', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
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/doc/build/templates/genindex.mako b/doc/build/templates/genindex.mako
index 2f45f79..cd47a4e 100644
--- a/doc/build/templates/genindex.mako
+++ b/doc/build/templates/genindex.mako
@@ -21,7 +21,7 @@
numcols = 1
numitems = 0
%>
-% for entryname, (links, subitems, dummy) in entries:
+% for entryname, (links, subitems) in [(a, b[0:2]) for a, b in entries]:
<dt>
% if links:
@@ -36,7 +36,7 @@
% if subitems:
<dd><dl>
- % for subentryname, subentrylinks in subitems:
+ % for subentryname, subentrylinks in subitems[0:2]:
<dt><a href="${subentrylinks[0][1]}">${subentryname|h}</a>
% for j, (unknown, link) in enumerate(subentrylinks[1:]):
<a href="${link}">[${j}]</a>
diff --git a/mako/__init__.py b/mako/__init__.py
index eaa24dc..01c1739 100644
--- a/mako/__init__.py
+++ b/mako/__init__.py
@@ -5,4 +5,4 @@
# the MIT License: http://www.opensource.org/licenses/mit-license.php
-__version__ = '1.0.6'
+__version__ = '1.0.7'
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/cache.py b/mako/cache.py
index 94f3870..1af17dd 100644
--- a/mako/cache.py
+++ b/mako/cache.py
@@ -95,7 +95,7 @@ class Cache(object):
**self._get_cache_kw(kw, context))
def set(self, key, value, **kw):
- """Place a value in the cache.
+ r"""Place a value in the cache.
:param key: the value's key.
:param value: the value.
@@ -113,7 +113,7 @@ class Cache(object):
"""
def get(self, key, **kw):
- """Retrieve a value from the cache.
+ r"""Retrieve a value from the cache.
:param key: the value's key.
:param \**kw: cache configuration arguments. The
@@ -125,7 +125,7 @@ class Cache(object):
return self.impl.get(key, **self._get_cache_kw(kw, None))
def invalidate(self, key, **kw):
- """Invalidate a value in the cache.
+ r"""Invalidate a value in the cache.
:param key: the value's key.
:param \**kw: cache configuration arguments. The
@@ -194,7 +194,7 @@ class CacheImpl(object):
"""
def get_or_create(self, key, creation_function, **kw):
- """Retrieve a value from the cache, using the given creation function
+ r"""Retrieve a value from the cache, using the given creation function
to generate a new value.
This function *must* return a value, either from
@@ -212,7 +212,7 @@ class CacheImpl(object):
raise NotImplementedError()
def set(self, key, value, **kw):
- """Place a value in the cache.
+ r"""Place a value in the cache.
:param key: the value's key.
:param value: the value.
@@ -222,7 +222,7 @@ class CacheImpl(object):
raise NotImplementedError()
def get(self, key, **kw):
- """Retrieve a value from the cache.
+ r"""Retrieve a value from the cache.
:param key: the value's key.
:param \**kw: cache configuration arguments.
@@ -231,7 +231,7 @@ class CacheImpl(object):
raise NotImplementedError()
def invalidate(self, key, **kw):
- """Invalidate a value in the cache.
+ r"""Invalidate a value in the cache.
:param key: the value's key.
:param \**kw: cache configuration arguments.
diff --git a/mako/cmd.py b/mako/cmd.py
index dd1f833..8db1346 100755
--- a/mako/cmd.py
+++ b/mako/cmd.py
@@ -58,7 +58,7 @@ def cmdline(argv=None):
kw = dict([varsplit(var) for var in options.var])
try:
- print(template.render(**kw))
+ sys.stdout.write(template.render(**kw))
except:
_exit()
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 = []
diff --git a/mako/parsetree.py b/mako/parsetree.py
index 879882e..e129916 100644
--- a/mako/parsetree.py
+++ b/mako/parsetree.py
@@ -258,7 +258,7 @@ class Tag(compat.with_metaclass(_TagMeta, Node)):
def __init__(self, keyword, attributes, expressions,
nonexpressions, required, **kwargs):
- """construct a new Tag instance.
+ r"""construct a new Tag instance.
this constructor not called directly, and is only called
by subclasses.
diff --git a/mako/template.py b/mako/template.py
index c3e0c25..329632c 100644
--- a/mako/template.py
+++ b/mako/template.py
@@ -21,7 +21,7 @@ import weakref
class Template(object):
- """Represents a compiled template.
+ r"""Represents a compiled template.
:class:`.Template` includes a reference to the original
template source (via the :attr:`.source` attribute)
diff --git a/setup.cfg b/setup.cfg
index 37bb374..8b9cf15 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,6 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
[pytest]
addopts = --tb native -v -r fxX
diff --git a/test/test_exceptions.py b/test/test_exceptions.py
index 8321b25..bcaae3b 100644
--- a/test/test_exceptions.py
+++ b/test/test_exceptions.py
@@ -91,7 +91,7 @@ ${u'привет'}
assert "".encode(sys.getdefaultencoding(),
'htmlentityreplace') in html_error
else:
- assert 'u''\
+ assert '''\
'привет'\
''</span><span class="cp">}</span>'.encode(
sys.getdefaultencoding(),
@@ -220,7 +220,7 @@ ${foobar}
assert ''привет'</span>' in \
l.get_template("foo.html").render().decode('utf-8')
else:
- assert 'u'прив'\
+ assert ''прив'\
'ет'</span>' in \
l.get_template("foo.html").render().decode('utf-8')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/mako.git
More information about the Python-modules-commits
mailing list